auto upstream

5 files changed, 68 insertions, 63 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0cad6454c3..c0b20fdbd63 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2013-04-23  Glenn Morris  <rgm@gnu.org>
+
+        * startup.el (normal-no-mouse-startup-screen, normal-about-screen):
+        Remove venerable code attempting to avoid substitute-command-keys.
+
+2013-04-23  Tassilo Horn  <tsdh@gnu.org>
+
+        * textmodes/reftex-vars.el (reftex-label-regexps): Call
+        `reftex-compile-variables' after changes to this variable.
+
+2013-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el: Fix signals in jit-lock-force-redisplay.
+        Use lexical-binding.
+        (jit-lock-force-redisplay): Use markers, check buffer's continued
+        existence and beware narrowed buffers.
+        (jit-lock-fontify-now): Adjust call accordingly.
+
+2013-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (minibuffer-completion-contents): Fix obsolescence info
+        to avoid misleading the user.
+
 2013-04-22  Leo Liu  <sdl.web@gmail.com>
 
         * info-look.el: Prefer latex2e.info.  (Bug#14240)
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index d879735c344..9359a65a1b8 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -1,4 +1,4 @@
-;;; jit-lock.el --- just-in-time fontification
+;;; jit-lock.el --- just-in-time fontification  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1998, 2000-2013 Free Software Foundation, Inc.
 
@@ -412,21 +412,24 @@ Defaults to the whole buffer.  END can be out of bounds."
            ;; eagerly extend the refontified region with
            ;; jit-lock-after-change-extend-region-functions.
            (when (< start orig-start)
-             (run-with-timer 0 nil 'jit-lock-force-redisplay
-                             (current-buffer) start orig-start))
+             (run-with-timer 0 nil #'jit-lock-force-redisplay
+                             (copy-marker start) (copy-marker orig-start)))
 
            ;; Find the start of the next chunk, if any.
            (setq start (text-property-any next end 'fontified nil))))))))
 
-(defun jit-lock-force-redisplay (buf start end)
+(defun jit-lock-force-redisplay (start end)
   "Force the display engine to re-render buffer BUF from START to END."
-  (with-current-buffer buf
-    (with-buffer-prepared-for-jit-lock
-     ;; Don't cause refontification (it's already been done), but just do
-     ;; some random buffer change, so as to force redisplay.
-     (put-text-property start end 'fontified t))))
-
-
+  (when (marker-buffer start)
+    (with-current-buffer (marker-buffer start)
+      (with-buffer-prepared-for-jit-lock
+       (when (> end (point-max))
+         (setq end (point-max) start (min start end)))
+       (when (< start (point-min))
+         (setq start (point-min) end (max start end)))
+       ;; Don't cause refontification (it's already been done), but just do
+       ;; some random buffer change, so as to force redisplay.
+       (put-text-property start end 'fontified t)))))
 
 ;;; Stealth fontification.
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 978b3a5b130..ef949f7482e 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -638,8 +638,8 @@ If ARGS are provided, then pass MESSAGE through `format'."
 
 (defun minibuffer-completion-contents ()
   "Return the user input in a minibuffer before point as a string.
-That used to be what completion commands operate on."
-  (declare (obsolete minibuffer-contents "24.4"))
+In Emacs-22, that was what completion commands operated on."
+  (declare (obsolete nil "24.4"))
   (buffer-substring (field-beginning) (point)))
 
 (defun delete-minibuffer-contents ()
diff --git a/lisp/startup.el b/lisp/startup.el
index dc21005ab94..b7b4c156f02 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1856,11 +1856,8 @@ To quit a partially entered command, type Control-g.\n")
   (insert "\n" (emacs-version)
           "\n" emacs-copyright))
 
-;; No mouse menus, so give help using kbd commands.
 (defun normal-no-mouse-startup-screen ()
-
-  ;; If keys have their default meanings,
-  ;; use precomputed string to save lots of time.
+  "Show a splash screen suitable for displays without mouse support."
   (let* ((c-h-accessible
           ;; If normal-erase-is-backspace is used on a tty, there's
           ;; no way to invoke C-h and you have to use F1 instead.
@@ -1938,47 +1935,24 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
                  'follow-link t)
   (insert "\n")
   (insert "\n" (emacs-version) "\n" emacs-copyright "\n")
-
-  (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
-           (eq (key-binding "\C-h\C-o") 'describe-distribution)
-           (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
-      (progn
-        (insert
-         "
-GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for ")
-        (insert-button "full details"
-                       'action (lambda (_button) (describe-no-warranty))
-                       'follow-link t)
-        (insert ".
-Emacs is Free Software--Free as in Freedom--so you can redistribute copies
-of Emacs and modify it; type C-h C-c to see ")
-        (insert-button "the conditions"
-                       'action (lambda (_button) (describe-copying))
-                       'follow-link t)
-        (insert ".
-Type C-h C-d for information on ")
-        (insert-button "getting the latest version"
-                       'action (lambda (_button) (describe-distribution))
-                       'follow-link t)
-        (insert "."))
-    (insert (substitute-command-keys
-             "
+  (insert (substitute-command-keys
+           "
 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for "))
-    (insert-button "full details"
-                   'action (lambda (_button) (describe-no-warranty))
-                   'follow-link t)
-    (insert (substitute-command-keys ".
+  (insert-button "full details"
+                 'action (lambda (_button) (describe-no-warranty))
+                 'follow-link t)
+  (insert (substitute-command-keys ".
 Emacs is Free Software--Free as in Freedom--so you can redistribute copies
 of Emacs and modify it; type \\[describe-copying] to see "))
-    (insert-button "the conditions"
-                   'action (lambda (_button) (describe-copying))
-                   'follow-link t)
-    (insert (substitute-command-keys".
+  (insert-button "the conditions"
+                 'action (lambda (_button) (describe-copying))
+                 'follow-link t)
+  (insert (substitute-command-keys".
 Type \\[describe-distribution] for information on "))
-    (insert-button "getting the latest version"
-                   'action (lambda (_button) (describe-distribution))
-                   'follow-link t)
-    (insert ".")))
+  (insert-button "getting the latest version"
+                 'action (lambda (_button) (describe-distribution))
+                 'follow-link t)
+  (insert "."))
 
 (defun normal-about-screen ()
   (insert "\n" (emacs-version) "\n" emacs-copyright "\n\n")
@@ -2027,14 +2001,11 @@ Type \\[describe-distribution] for information on "))
   (insert "\tBuying printed manuals from the FSF\n"))
 
 (defun startup-echo-area-message ()
-  (cond ((daemonp)
-         "Starting Emacs daemon.")
-        ((eq (key-binding "\C-h\C-a") 'about-emacs)
-         "For information about GNU Emacs and the GNU system, type C-h C-a.")
-        (t
-         (substitute-command-keys
-          "For information about GNU Emacs and the GNU system, type \
-\\[about-emacs]."))))
+  (if (daemonp)
+      "Starting Emacs daemon."
+    (substitute-command-keys
+     "For information about GNU Emacs and the GNU system, type \
+\\[about-emacs].")))
 
 (defun display-startup-echo-area-message ()
   (let ((resize-mini-windows t))
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index c00cf36c79e..7343d86b06f 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -873,7 +873,15 @@ DOWNCASE    t:   Downcase words before using them."
 The default value matches usual \\label{...} definitions and
 keyval style [..., label = {...}, ...] label definitions.  It is
 assumed that the regexp group 1 matches the label text, so you
-have to define it using \\(?1:...\\) when adding new regexps."
+have to define it using \\(?1:...\\) when adding new regexps.
+
+When changed from Lisp, make sure to call
+`reftex-compile-variables' afterwards to make the change
+effective."
+  :set (lambda (symbol value)
+         (set symbol value)
+         (when (fboundp 'reftex-compile-variables)
+           (reftex-compile-variables)))
   :group 'reftex-defining-label-environments
   :type '(repeat (regexp :tag "Regular Expression")))