From 9fa454499d8996d5814a94ad30263b32bf5219c0 Mon Sep 17 00:00:00 2001
From: Curtis Mattoon <cmattoon@cmattoon.com>
Date: Tue, 6 Aug 2013 20:34:36 -0400
Subject: [PATCH 1/4] Modified Pico::get_pages() to ignore Emacs (~) and Nano
 (#) temp files

---
 lib/pico.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/pico.php b/lib/pico.php
index d2230bd..3feed0b 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -218,7 +218,11 @@ class Pico {
 				unset($pages[$key]);
 				continue;
 			}
-			
+            // Ignore Emacs (and Nano) temp files
+            if (in_array(substr($page, -1), array('~','#'))) {
+			    unset($pages[$key]);
+			    continue;
+			}			
 			// Get title and format $page
 			$page_content = file_get_contents($page);
 			$page_meta = $this->read_file_meta($page_content);
@@ -336,4 +340,4 @@ class Pico {
 
 }
 
-?>
\ No newline at end of file
+?>

From 10eeea80c1d1e40708a4fac1ade97d4e0cbe0591 Mon Sep 17 00:00:00 2001
From: Curtis Mattoon <cmattoon@cmattoon.com>
Date: Tue, 6 Aug 2013 20:34:36 -0400
Subject: [PATCH 2/4] Modified Pico::get_pages() to ignore Emacs (~) and Nano
 (#) temp files

---
 lib/pico.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/pico.php b/lib/pico.php
index d2230bd..17ca8b7 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -218,7 +218,11 @@ class Pico {
 				unset($pages[$key]);
 				continue;
 			}
-			
+                        // Ignore Emacs (and Nano) temp files
+                        if (in_array(substr($page, -1), array('~','#'))) {
+			    unset($pages[$key]);
+			    continue;
+			}			
 			// Get title and format $page
 			$page_content = file_get_contents($page);
 			$page_meta = $this->read_file_meta($page_content);
@@ -336,4 +340,4 @@ class Pico {
 
 }
 
-?>
\ No newline at end of file
+?>

From 8141ccaeb553a3bac91b361ce55a63d8ff01f415 Mon Sep 17 00:00:00 2001
From: Curtis Mattoon <cmattoon@cmattoon.com>
Date: Tue, 6 Aug 2013 21:43:49 -0400
Subject: [PATCH 3/4] Merge branch 'master' of https://github.com/cmattoon/Pico

Conflicts:
	lib/pico.php
---
 lib/pico.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pico.php b/lib/pico.php
index 17ca8b7..8f0ade1 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -218,6 +218,7 @@ class Pico {
 				unset($pages[$key]);
 				continue;
 			}
+
                         // Ignore Emacs (and Nano) temp files
                         if (in_array(substr($page, -1), array('~','#'))) {
 			    unset($pages[$key]);

From 2e26edaa13159f57fb61ab38ae12b2f8e7c92ecb Mon Sep 17 00:00:00 2001
From: Curtis Mattoon <cmattoon@cmattoon.com>
Date: Tue, 6 Aug 2013 21:51:03 -0400
Subject: [PATCH 4/4] Replaced spaces with tabs... d'oh

---
 lib/pico.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pico.php b/lib/pico.php
index 8f0ade1..275c54e 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -219,10 +219,10 @@ class Pico {
 				continue;
 			}
 
-                        // Ignore Emacs (and Nano) temp files
-                        if (in_array(substr($page, -1), array('~','#'))) {
-			    unset($pages[$key]);
-			    continue;
+			// Ignore Emacs (and Nano) temp files
+			if (in_array(substr($page, -1), array('~','#'))) {
+				unset($pages[$key]);
+				continue;
 			}			
 			// Get title and format $page
 			$page_content = file_get_contents($page);