summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-22 11:36:45 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-22 11:36:45 -0800
commit7c82f3e23e37cc848a38b1f8be7149fd672a6393 (patch)
treee721d1d5361deeb04278045331d74e9c7f8b00f0 /lisp/emacs-lisp
parent80094035aff85d827e1ef65627974b34ad9fa8df (diff)
parentbd2a4b24c4a591240862704737b5bc696ff67cbf (diff)
downloademacs-7c82f3e23e37cc848a38b1f8be7149fd672a6393.tar.gz
emacs-7c82f3e23e37cc848a38b1f8be7149fd672a6393.tar.bz2
emacs-7c82f3e23e37cc848a38b1f8be7149fd672a6393.zip
Merge from emacs-23
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/checkdoc.el4
-rw-r--r--lisp/emacs-lisp/re-builder.el2
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 00f2df9fe02..84c00d0d0ba 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1798,7 +1798,9 @@ Replace with \"%s\"? " original replace)
(let ((found nil) (start (point)) (msg nil) (ms nil))
(while (and (not msg)
(re-search-forward
- "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^]']"
+ ;; Ignore manual page refereces like
+ ;; git-config(1).
+ "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^](']"
e t))
(setq ms (match-string 1))
;; A . is a \s_ char, so we must remove periods from
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 07d5b0e52e7..12a66582317 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -243,7 +243,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
:help "Quit the RE Builder mode"))
(define-key menu-map [rt]
'(menu-item "Case sensitive" reb-toggle-case
- :button (:toggle . case-fold-search)
+ :button (:toggle . (null case-fold-search))
:help "Toggle case sensitivity of searches for RE Builder target buffer"))
(define-key menu-map [rb]
'(menu-item "Change target buffer..." reb-change-target-buffer