Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Simon Morgan 2015-05-25 22:40:11 +01:00
commit 5214f0ef0f

View File

@ -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.