From 913ab2bc2ed570eb4890feb979db9aa2ce21e7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jostein=20Kj=C3=B8nigsen?= <jostein@kjonigsen.net>
Date: Tue, 29 Apr 2014 22:10:55 +0200
Subject: Syntax errors. Regexp needs to be greedier.

---
 elisp.html.markdown | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'elisp.html.markdown')

diff --git a/elisp.html.markdown b/elisp.html.markdown
index d3910759..3208ffb8 100644
--- a/elisp.html.markdown
+++ b/elisp.html.markdown
@@ -280,10 +280,10 @@ filename: learn-emacs-lisp.el
 ;; should stop searching at some point in the buffer, and whether it
 ;; should silently fail when nothing is found:
 
-;; (search-forward "Hello" nil t) does the trick:
+;; (search-forward "Hello" nil 't) does the trick:
 
 ;; The `nil' argument says: the search is not bound to a position.
-;; The `t' argument says: silently fail when nothing is found.
+;; The `'t' argument says: silently fail when nothing is found.
 
 ;; We use this sexp in the function below, which doesn't throw an error:
 
@@ -294,7 +294,7 @@ filename: learn-emacs-lisp.el
     (mapcar 'hello list-of-names)
     (goto-char (point-min))
     ;; Replace "Hello" by "Bonjour"
-    (while (search-forward "Hello" nil t)
+    (while (search-forward "Hello" nil 't)
       (replace-match "Bonjour"))
     (other-window 1))
 
@@ -305,7 +305,7 @@ filename: learn-emacs-lisp.el
 (defun boldify-names ()
     (switch-to-buffer-other-window "*test*")
     (goto-char (point-min))
-    (while (re-search-forward "Bonjour \\(.+\\)!" nil t)
+    (while (re-search-forward "Bonjour \\([^!]+\\)!" nil 't)
       (add-text-properties (match-beginning 1)
                            (match-end 1)
                            (list 'face 'bold)))
@@ -317,9 +317,9 @@ filename: learn-emacs-lisp.el
 
 ;; The regular expression is "Bonjour \\(.+\\)!" and it reads:
 ;; the string "Bonjour ", and
-;; a group of           | this is the \\( ... \\) construct
-;;   any character      | this is the .
-;;   possibly repeated  | this is the +
+;; a group of            | this is the \\( ... \\) construct
+;;   any character not ! | this is the [^!]
+;;   possibly repeated   | this is the +
 ;; and the "!" string.
 
 ;; Ready?  Test it!
-- 
cgit v1.2.3


From c7c3e973612c3730615f0d7fee0cafae48d1ade9 Mon Sep 17 00:00:00 2001
From: tomnor <tomasn@kth.se>
Date: Fri, 22 May 2015 23:05:37 +0200
Subject: editorial revert of a change, remove trailing whitespace

Now the regular expression is back to what it was and align with how it is in
other languages. Also it aligns with the commented description of the regular
expression.
---
 elisp.html.markdown | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'elisp.html.markdown')

diff --git a/elisp.html.markdown b/elisp.html.markdown
index 3208ffb8..3bed5d1c 100644
--- a/elisp.html.markdown
+++ b/elisp.html.markdown
@@ -29,7 +29,7 @@ filename: learn-emacs-lisp.el
 ;; I hereby decline any responsability.  Have fun!
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
+;;
 ;; Fire up Emacs.
 ;;
 ;; Hit the `q' key to dismiss the welcome message.
@@ -42,9 +42,9 @@ filename: learn-emacs-lisp.el
 ;; The scratch buffer is the default buffer when opening Emacs.
 ;; You are never editing files: you are editing buffers that you
 ;; can save to a file.
-;; 
+;;
 ;; "Lisp interaction" refers to a set of commands available here.
-;; 
+;;
 ;; Emacs has a built-in set of commands available in every buffer,
 ;; and several subsets of commands available when you activate a
 ;; specific mode.  Here we use the `lisp-interaction-mode', which
@@ -109,7 +109,7 @@ filename: learn-emacs-lisp.el
 ;; The empty parentheses in the function's definition means that
 ;; it does not accept arguments.  But always using `my-name' is
 ;; boring, let's tell the function to accept one argument (here
-;; the argument is called "name"): 
+;; the argument is called "name"):
 
 (defun hello (name) (insert "Hello " name))
 ;; `C-xC-e' => hello
@@ -305,7 +305,7 @@ filename: learn-emacs-lisp.el
 (defun boldify-names ()
     (switch-to-buffer-other-window "*test*")
     (goto-char (point-min))
-    (while (re-search-forward "Bonjour \\([^!]+\\)!" nil 't)
+    (while (re-search-forward "Bonjour \\(.+\\)!" nil 't)
       (add-text-properties (match-beginning 1)
                            (match-end 1)
                            (list 'face 'bold)))
@@ -318,7 +318,7 @@ filename: learn-emacs-lisp.el
 ;; The regular expression is "Bonjour \\(.+\\)!" and it reads:
 ;; the string "Bonjour ", and
 ;; a group of            | this is the \\( ... \\) construct
-;;   any character not ! | this is the [^!]
+;;   any character       | this is the .
 ;;   possibly repeated   | this is the +
 ;; and the "!" string.
 
-- 
cgit v1.2.3