(font-lock-syntactic-keywords): Add defvar.

[gnu-emacs] / lisp / simple.el

diff --git a/lisp/simple.el b/lisp/simple.el
index affc4dd8ea8f9b2acce764ff44ef04af6a8ab23c..a0eeaa2d00fc7ea393bc1b9ba29c687dfddbe765 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -308,7 +308,7 @@ select the source buffer."
 When turned on, cursor motion in the compilation, grep, occur or diff
 buffer causes automatic display of the corresponding source code
 location."
 When turned on, cursor motion in the compilation, grep, occur or diff
 buffer causes automatic display of the corresponding source code
 location."

-  :group 'next-error :init-value " Fol"
+  :group 'next-error :init-value nil :lighter " Fol"

   (if (not next-error-follow-minor-mode)
       (remove-hook 'post-command-hook 'next-error-follow-mode-post-command-hook t)
     (add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t)
   (if (not next-error-follow-minor-mode)
       (remove-hook 'post-command-hook 'next-error-follow-mode-post-command-hook t)
     (add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t)


@@ -3240,8 +3240,8 @@ as a fallback, and won't change the buffer bounds.")
     (or (and (>= position (point-min))
             (<= position (point-max)))
        (if widen-automatically
     (or (and (>= position (point-min))
             (<= position (point-max)))
        (if widen-automatically

-           (error "Global mark position is outside accessible part of buffer")
-         (widen)))
+           (widen)
+         (error "Global mark position is outside accessible part of buffer")))

     (goto-char position)
     (switch-to-buffer buffer)))
 \f
     (goto-char position)
     (switch-to-buffer buffer)))
 \f


@@ -4207,8 +4207,9 @@ when it is off screen)."
   :group 'paren-blinking)
 
 (defcustom blink-matching-paren-distance (* 25 1024)
   :group 'paren-blinking)
 
 (defcustom blink-matching-paren-distance (* 25 1024)

-  "*If non-nil, is maximum distance to search for matching open-paren."
-  :type 'integer
+  "*If non-nil, maximum distance to search backwards for matching open-paren.
+If nil, search stops at the beginning of the accessible portion of the buffer."
+  :type '(choice (const nil) integer)

   :group 'paren-blinking)
 
 (defcustom blink-matching-delay 1
   :group 'paren-blinking)
 
 (defcustom blink-matching-delay 1