upstream

15 files changed, 275 insertions, 126 deletions

diff --git a/etc/NEWS b/etc/NEWS
index ec863dacef8..cec19d0c0a2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -407,7 +407,7 @@ If non-nil, C-d, [delete], and DEL delete the region if it is active
 and no prefix argument is given.  If set to `kill', these commands
 kill instead.
 
-*** New command `delete-forward-char', bound to C-d and [delete].
+*** New command `delete-forward-char', bound to [delete].
 This is meant for interactive use, and obeys `delete-active-region'.
 The command `delete-char' does not obey `delete-active-region'.
 
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 5309671651b..2dbccf9be39 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (OTHERS):
+        * makefile.w32-in (MISC): Add ipa-praat.elc.
+
 2011-07-23  Yair F  <yair.f.lists@gmail.com>
 
         * quail/hebrew.el ("hebrew"): Additional key mappings.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 18eb8b62a96..87020616a57 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -124,6 +124,7 @@ OTHERS= \
         ${srcdir}/quail/arabic.elc \
         ${srcdir}/quail/ethiopic.elc \
         ${srcdir}/quail/ipa.elc \
+        ${srcdir}/quail/ipa-praat.elc \
         ${srcdir}/quail/hebrew.elc \
         ${srcdir}/quail/georgian.elc \
         $(srcdir)/quail/persian.elc \
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 1ab14c72b3d..231384308f2 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -118,6 +118,7 @@ MISC= \
         $(srcdir)/quail/arabic.elc \
         $(srcdir)/quail/ethiopic.elc \
         $(srcdir)/quail/ipa.elc \
+        $(srcdir)/quail/ipa-praat.elc \
         $(srcdir)/quail/hebrew.elc \
         $(srcdir)/quail/georgian.elc \
         $(srcdir)/quail/persian.elc \
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fcccc802203..c655c4968df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,55 @@
+2011-08-20  Glenn Morris  <rgm@gnu.org>
+
+        * tutorial.el (help-with-tutorial): Avoid an error on short screens.
+
+        * tutorial.el (tutorial--default-keys): Update some default bindings.
+
+        * files.el (hack-local-variables): Fully ignore case for "mode:".
+
+2011-08-20  Alan Mackenzie  <acm@muc.de>
+
+        Resolve invalid use of a regexp in regexp-opt.
+
+        * cc-fonts.el (c-complex-decl-matchers): Add in special detection
+        for a java annotation.
+
+        * cc-engine.el (c-forward-decl-or-cast-1): Add in special
+        detection for a java annotation.
+
+        * cc-langs.el (c-prefix-spec-kwds-re): Remove the special handling
+        for java.
+        (c-modifier-kwds): Remove the regexp "@[A-za-z0-9]+".
+
+2011-08-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (normal-top-level-add-subdirs-to-load-path): Doc fix
+        (Bug#9274).
+
+2011-08-20  Alan Mackenzie  <acm@muc.de>
+
+        * Fontify CPP expressions correctly when starting in the middle of
+        such a construct.  Mainly for when jit-lock etc. starts a chunk
+        here.
+
+        * progmodes/cc-fonts.el (c-font-lock-context): new buffer local
+        variable.
+        (c-make-font-lock-search-form): new function, extracted from
+        c-make-font-lock-search-function.
+        (c-make-font-lock-search-function): Use the above function.
+        (c-make-font-lock-context-search-function): New function.
+        (c-cpp-matchers): Enhance the preprocessor expression case with
+        the above function
+        (c-font-lock-complex-decl-prepare): Test for being in a CPP form
+        which takes an expression.
+
+        * progmodes/cc-langs.el (c-cpp-expr-intro-re): New lang-variable.
+
+2011-08-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-reuse-window)
+        (display-buffer-pop-up-window): Don't reuse or split a side
+        window.
+
 2011-08-19  Glenn Morris  <rgm@gnu.org>
 
         * files.el (hack-local-variables-prop-line, hack-local-variables):
diff --git a/lisp/bindings.el b/lisp/bindings.el
index c4f9369219a..57bfeb60f82 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -834,6 +834,7 @@ if `inhibit-field-text-motion' is non-nil."
     (setq i (1+ i))))
 (define-key global-map [?\C-\M--] 'negative-argument)
 
+;; Update tutorial--default-keys if you change these.
 (define-key global-map "\177" 'delete-backward-char)
 (define-key global-map "\C-d" 'delete-char)
 
diff --git a/lisp/files.el b/lisp/files.el
index 8c7e63dda14..07188e152b3 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3154,7 +3154,8 @@ major-mode."
                            (var (let ((read-circle nil))
                                   (read str)))
                            val val2)
-                      (and (eq var 'Mode) (setq var 'mode))
+                      (and (equal (downcase (symbol-name var)) "mode")
+                           (setq var 'mode))
                       ;; Read the variable value.
                       (skip-chars-forward "^:")
                       (forward-char 1)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 0d88f85d263..a1cbdc16560 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6325,7 +6325,9 @@ comment at the start of cc-engine.el for more info."
         (let* ((start (point)) kwd-sym kwd-clause-end found-type)
 
           ;; Look for a specifier keyword clause.
-          (when (looking-at c-prefix-spec-kwds-re)
+          (when (or (looking-at c-prefix-spec-kwds-re)
+                    (and (c-major-mode-is 'java-mode)
+                         (looking-at "@[A-Za-z0-9]+")))
             (if (looking-at c-typedef-key)
                 (setq at-typedef t))
             (setq kwd-sym (c-keyword-sym (match-string 1)))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 2277ba760ab..3d5dc30d823 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -199,10 +199,16 @@
 (set-face-foreground 'c-annotation-face "blue")
 
 (eval-and-compile
-  ;; We need the following functions during compilation since they're
-  ;; called when the `c-lang-defconst' initializers are evaluated.
-  ;; Define them at runtime too for the sake of derived modes.
-
+  ;; We need the following definitions during compilation since they're
+  ;; used when the `c-lang-defconst' initializers are evaluated.  Define
+  ;; them at runtime too for the sake of derived modes.
+
+  ;; This indicates the "font locking context", and is set just before
+  ;; fontification is done.  If non-nil, it says, e.g., point starts
+  ;; from within a #if preprocessor construct.
+  (defvar c-font-lock-context nil)
+  (make-variable-buffer-local 'c-font-lock-context)
+  
   (defmacro c-put-font-lock-face (from to face)
     ;; Put a face on a region (overriding any existing face) in the way
     ;; font-lock would do it.  In XEmacs that means putting an
@@ -283,6 +289,45 @@
                               nil)))))
           res))))
 
+  (defun c-make-font-lock-search-form (regexp highlights)
+    ;; Return a lisp form which will fontify every occurence of REGEXP
+    ;; (a regular expression, NOT a function) between POINT and `limit'
+    ;; with HIGHLIGHTS, a list of highlighters as specified on page
+    ;; "Search-based Fontification" in the elisp manual.
+    `(while (re-search-forward ,regexp limit t)
+       (unless (progn
+                 (goto-char (match-beginning 0))
+                 (c-skip-comments-and-strings limit))
+         (goto-char (match-end 0))
+         ,@(mapcar
+            (lambda (highlight)
+              (if (integerp (car highlight))
+                  ;; e.g. highlight is (1 font-lock-type-face t)
+                  (progn
+                    (unless (eq (nth 2 highlight) t)
+                      (error
+                       "The override flag must currently be t in %s"
+                       highlight))
+                    (when (nth 3 highlight)
+                      (error
+                       "The laxmatch flag may currently not be set in %s"
+                       highlight))
+                    `(save-match-data
+                       (c-put-font-lock-face
+                        (match-beginning ,(car highlight))
+                        (match-end ,(car highlight))
+                        ,(elt highlight 1))))
+                ;; highlight is an "ANCHORED HIGHLIGHER" of the form
+                ;; (ANCHORED-MATCHER PRE-FORM POST-FORM SUBEXP-HIGHLIGHTERS...)
+                (when (nth 3 highlight)
+                  (error "Match highlights currently not supported in %s"
+                         highlight))
+                `(progn
+                   ,(nth 1 highlight)
+                   (save-match-data ,(car highlight))
+                   ,(nth 2 highlight))))
+            highlights))))
+
   (defun c-make-font-lock-search-function (regexp &rest highlights)
     ;; This function makes a byte compiled function that works much like
     ;; a matcher element in `font-lock-keywords'.  It cuts out a little
@@ -313,43 +358,101 @@
     ;; lambda more easily.
     (byte-compile
      `(lambda (limit)
-        (let (;; The font-lock package in Emacs is known to clobber
+        (let ( ;; The font-lock package in Emacs is known to clobber
               ;; `parse-sexp-lookup-properties' (when it exists).
               (parse-sexp-lookup-properties
                (cc-eval-when-compile
                  (boundp 'parse-sexp-lookup-properties))))
-          (while (re-search-forward ,regexp limit t)
-            (unless (progn
-                      (goto-char (match-beginning 0))
-                      (c-skip-comments-and-strings limit))
-              (goto-char (match-end 0))
-              ,@(mapcar
-                 (lambda (highlight)
-                   (if (integerp (car highlight))
-                       (progn
-                         (unless (eq (nth 2 highlight) t)
-                           (error
-                            "The override flag must currently be t in %s"
-                            highlight))
-                         (when (nth 3 highlight)
-                           (error
-                            "The laxmatch flag may currently not be set in %s"
-                            highlight))
-                         `(save-match-data
-                            (c-put-font-lock-face
-                             (match-beginning ,(car highlight))
-                             (match-end ,(car highlight))
-                             ,(elt highlight 1))))
-                     (when (nth 3 highlight)
-                       (error "Match highlights currently not supported in %s"
-                              highlight))
-                     `(progn
-                        ,(nth 1 highlight)
-                        (save-match-data ,(car highlight))
-                        ,(nth 2 highlight))))
-                 highlights))))
+
+          ;; (while (re-search-forward ,regexp limit t)
+          ;;   (unless (progn
+          ;;          (goto-char (match-beginning 0))
+          ;;          (c-skip-comments-and-strings limit))
+          ;;     (goto-char (match-end 0))
+          ;;     ,@(mapcar
+          ;;     (lambda (highlight)
+          ;;       (if (integerp (car highlight))
+          ;;           (progn
+          ;;             (unless (eq (nth 2 highlight) t)
+          ;;               (error
+          ;;                "The override flag must currently be t in %s"
+          ;;                highlight))
+          ;;             (when (nth 3 highlight)
+          ;;               (error
+          ;;                "The laxmatch flag may currently not be set in %s"
+          ;;                highlight))
+          ;;             `(save-match-data
+          ;;                (c-put-font-lock-face
+          ;;                 (match-beginning ,(car highlight))
+          ;;                 (match-end ,(car highlight))
+          ;;                 ,(elt highlight 1))))
+          ;;         (when (nth 3 highlight)
+          ;;           (error "Match highlights currently not supported in %s"
+          ;;                  highlight))
+          ;;         `(progn
+          ;;            ,(nth 1 highlight)
+          ;;            (save-match-data ,(car highlight))
+          ;;            ,(nth 2 highlight))))
+          ;;     highlights)))
+          ,(c-make-font-lock-search-form regexp highlights))
+
         nil)))
 
+  (defun c-make-font-lock-context-search-function (normal &rest state-stanzas)
+    ;; This function makes a byte compiled function that works much like
+    ;; a matcher element in `font-lock-keywords', with the following
+    ;; enhancement: the generated function will test for particular "font
+    ;; lock contexts" at the start of the region, i.e. is this point in
+    ;; the middle of some particular construct?  if so the generated
+    ;; function will first fontify the tail of the construct, before
+    ;; going into the main loop and fontify full constructs up to limit.
+    ;;
+    ;; The generated function takes one parameter called `limit', and
+    ;; will fontify the region between POINT and LIMIT.
+    ;;
+    ;; NORMAL is a list of the form (REGEXP HIGHLIGHTS .....), and is
+    ;; used to fontify the "regular" bit of the region.
+    ;; STATE-STANZAS is list of elements of the form (STATE LIM REGEXP
+    ;; HIGHLIGHTS), each element coding one possible font lock context.
+
+    ;; o - REGEXP is a font-lock regular expression (NOT a function),
+    ;; o - HIGHLIGHTS is a list of zero or more highlighters as defined
+    ;;   on page "Search-based Fontification" in the elisp manual.  As
+    ;;   yet (2009-06), they must have OVERRIDE set, and may not have
+    ;;   LAXMATCH set.
+    ;;
+    ;; o - STATE is the "font lock context" (e.g. in-cpp-expr) and is
+    ;;   not quoted.
+    ;; o - LIM is a lisp form whose evaluation will yield the limit
+    ;;   position in the buffer for fontification by this stanza.
+    ;;
+    ;; This function does not do any hidden buffer changes, but the
+    ;; generated functions will.  (They are however used in places
+    ;; covered by the font-lock context.)
+    ;; 
+    ;; Note: Replace `byte-compile' with `eval' to debug the generated
+    ;; lambda more easily.
+    (byte-compile
+     `(lambda (limit)
+        (let ( ;; The font-lock package in Emacs is known to clobber
+              ;; `parse-sexp-lookup-properties' (when it exists).
+              (parse-sexp-lookup-properties
+               (cc-eval-when-compile
+                 (boundp 'parse-sexp-lookup-properties))))
+          ,@(mapcar
+             (lambda (stanza)
+               (let ((state (car stanza))
+                     (lim (nth 1 stanza))
+                     (regexp (nth 2 stanza))
+                     (highlights (cdr (cddr stanza))))
+                 `(if (eq c-font-lock-context ',state)
+                      (let ((limit ,lim))
+                        ,(c-make-font-lock-search-form
+                          regexp highlights)))))
+             state-stanzas)
+          ,(c-make-font-lock-search-form (car normal) (cdr normal))
+          nil))))
+
 ;  (eval-after-load "edebug" ; 2006-07-09: def-edebug-spec is now in subr.el.
 ;    '(progn
   (def-edebug-spec c-fontify-types-and-refs let*)
@@ -494,19 +597,24 @@ stuff.  Used on level 1 and higher."
                                   (c-lang-const c-cpp-expr-directives)))
                         (cef-re (c-make-keywords-re t
                                   (c-lang-const c-cpp-expr-functions))))
-                    `((,(c-make-font-lock-search-function
-                         (concat noncontinued-line-end
-                                 (c-lang-const c-opt-cpp-prefix)
-                                 ced-re ; 1 + ncle-depth
-                                 ;; Match the whole logical line to look
-                                 ;; for the functions in.
-                                 "\\(\\\\\\(.\\|[\n\r]\\)\\|[^\n\r]\\)*")
-                         `((let ((limit (match-end 0)))
-                             (while (re-search-forward ,cef-re limit 'move)
-                               (c-put-font-lock-face (match-beginning 1)
-                                                     (match-end 1)
-                                                     c-preprocessor-face-name)))
-                           (goto-char (match-end ,(1+ ncle-depth)))))))))
+
+                    `((,(c-make-font-lock-context-search-function
+                         `(,(concat noncontinued-line-end
+                                    (c-lang-const c-opt-cpp-prefix)
+                                    ced-re ; 1 + ncle-depth
+                                    ;; Match the whole logical line to look
+                                    ;; for the functions in.
+                                    "\\(\\\\\\(.\\|[\n\r]\\)\\|[^\n\r]\\)*")
+                           ((let ((limit (match-end 0)))
+                              (while (re-search-forward ,cef-re limit 'move)
+                                (c-put-font-lock-face (match-beginning 1)
+                                                      (match-end 1)
+                                                      c-preprocessor-face-name)))
+                            (goto-char (match-end ,(1+ ncle-depth)))))
+                         `(in-cpp-expr
+                           (save-excursion (c-end-of-macro) (point))
+                           ,cef-re
+                           (1 c-preprocessor-face-name t)))))))
 
               ;; Fontify the directive names.
               (,(c-make-font-lock-search-function
@@ -759,6 +867,12 @@ casts and declarations are fontified.  Used on level 2 and higher."
       (c-forward-syntactic-ws limit)
       (c-font-lock-declarators limit t (eq prop 'c-decl-type-start))))
 
+  (setq c-font-lock-context ;; (c-guess-font-lock-context)
+        (save-excursion
+          (if (and c-cpp-expr-intro-re
+                   (c-beginning-of-macro)
+                   (looking-at c-cpp-expr-intro-re))
+              'in-cpp-expr)))
   nil)
 
 (defun c-font-lock-<>-arglists (limit)
@@ -1552,7 +1666,9 @@ on level 2 only and so aren't combined with `c-complex-decl-matchers'."
                         (unless (c-skip-comments-and-strings limit)
                           (c-forward-syntactic-ws)
                           ;; Handle prefix declaration specifiers.
-                          (when (looking-at c-prefix-spec-kwds-re)
+                          (when (or (looking-at c-prefix-spec-kwds-re)
+                                    (and (c-major-mode-is 'java-mode)
+                                         (looking-at "@[A-Za-z0-9]+")))
                             (c-forward-keyword-clause 1))
                           ,(if (c-major-mode-is 'c++-mode)
                                `(when (and (c-forward-type)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 35097242cb7..279c5e46c46 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -815,6 +815,16 @@ expression."
   t (if (c-lang-const c-opt-cpp-prefix)
         '("if" "elif")))
 
+(c-lang-defconst c-cpp-expr-intro-re
+  "Regexp which matches the start of a CPP directive which contains an
+expression, or nil if there aren't any in the language."
+  t (if (c-lang-const c-cpp-expr-directives)
+        (concat
+         (c-lang-const c-opt-cpp-prefix)
+         (c-make-keywords-re t (c-lang-const c-cpp-expr-directives)))))
+(c-lang-defvar c-cpp-expr-intro-re
+  (c-lang-const c-cpp-expr-intro-re))
+
 (c-lang-defconst c-cpp-expr-functions
   "List of functions in cpp expressions."
   t    (if (c-lang-const c-opt-cpp-prefix)
@@ -1813,7 +1823,7 @@ will be handled."
          "bindsTo" "delegatesTo" "implements" "proxy" "storedOn")
   ;; Note: "const" is not used in Java, but it's still a reserved keyword.
   java '("abstract" "const" "final" "native" "private" "protected" "public"
-         "static" "strictfp" "synchronized" "transient" "volatile" "@[A-Za-z0-9]+")
+         "static" "strictfp" "synchronized" "transient" "volatile")
   pike '("final" "inline" "local" "nomask" "optional" "private" "protected"
          "public" "static" "variant"))
 
@@ -1899,10 +1909,7 @@ one of `c-type-list-kwds', `c-ref-list-kwds',
 
 (c-lang-defconst c-prefix-spec-kwds-re
   ;; Adorned regexp of `c-prefix-spec-kwds'.
-  t (c-make-keywords-re t (c-lang-const c-prefix-spec-kwds))
-  java (replace-regexp-in-string
-     "\\\\\\[" "["
-     (replace-regexp-in-string "\\\\\\+" "+" (c-make-keywords-re t (c-lang-const c-prefix-spec-kwds)))))
+  t (c-make-keywords-re t (c-lang-const c-prefix-spec-kwds)))
 
 (c-lang-defvar c-prefix-spec-kwds-re (c-lang-const c-prefix-spec-kwds-re))
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 0dee969fb5a..6c3bb397e9a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -409,7 +409,7 @@ The regexp should not contain a starting \"\\`\" or a trailing
  \"\\'\"; those are added automatically by callers.")
 
 (defun normal-top-level-add-subdirs-to-load-path ()
-  "Add all subdirectories of current directory to `load-path'.
+  "Add all subdirectories of `default-directory' to `load-path'.
 More precisely, this uses only the subdirectories whose names
 start with letters or digits; it excludes any subdirectory named `RCS'
 or `CVS', and any subdirectory that contains a file named `.nosearch'."
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 77ef50843d3..c57ec33d2e2 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -253,7 +253,7 @@ LEFT and RIGHT are the elements to compare."
              ;; * INSERTING AND DELETING
              ;; C-u 8 * to insert ********.
              (delete-backward-char "\d")
-             (delete-forward-char [?\C-d])
+             (delete-char [?\C-d])
              (backward-kill-word [?\M-\d])
              (kill-word [?\M-d])
              (kill-line [?\C-k])
@@ -298,7 +298,7 @@ LEFT and RIGHT are the elements to compare."
              (isearch-backward [?\C-r])
 
              ;; * MULTIPLE WINDOWS
-             (split-window-vertically [?\C-x ?2])
+             (split-window-above-each-other [?\C-x ?2])
              (scroll-other-window [?\C-\M-v])
              (other-window [?\C-x ?o])
              (find-file-other-window [?\C-x ?4 ?\C-f])
@@ -889,6 +889,11 @@ Run the Viper tutorial? "))
                  (search-forward ">>")
                  (replace-match "]")))
           (beginning-of-line)
+          ;; FIXME: if the window is not tall, and especially if the
+          ;; big red "NOTICE: The main purpose..." text has been
+          ;; inserted at the start of the buffer, the "type C-v to
+          ;; move to the next screen" might not be visible on the
+          ;; first screen (n < 0).  How will the novice know what to do?
           (let ((n (- (window-height (selected-window))
                       (count-lines (point-min) (point))
                       6)))
@@ -897,7 +902,7 @@ Run the Viper tutorial? "))
                   ;; For a short gap, we don't need the [...] line,
                   ;; so delete it.
                   (delete-region (point) (progn (end-of-line) (point)))
-                  (newline n))
+                  (if (> n 0) (newline n)))
               ;; Some people get confused by the large gap.
               (newline (/ n 2))
 
diff --git a/lisp/window.el b/lisp/window.el
index eca3dcb435d..75fa0b46a1c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4763,8 +4763,10 @@ BUFFER, nil if none was found."
     (dolist (window (window-list-1 nil 'nomini method-frame))
       (let ((window-buffer (window-buffer window)))
         (when (and (not (window-minibuffer-p window))
-                   ;; Don't reuse a side window.
-                   (or (not (eq (window-parameter window 'window-side) 'side))
+                   ;; Don't reuse a side window unless it shows the
+                   ;; buffer already.
+                   (or (memq (window-parameter window 'window-side)
+                             '(nil none))
                        (eq window-buffer buffer))
                    (or (not method-window)
                        (and (eq method-window 'same)
@@ -5033,7 +5035,8 @@ description."
                      ;; and must be neither a minibuffer window
                      (not (window-minibuffer-p window))
                      ;; nor a side window.
-                     (not (eq (window-parameter window 'window-side) 'side)))
+                     (memq (window-parameter window 'window-side)
+                           '(nil none)))
             (setq window
                   (cond
                    ((memq side display-buffer-side-specifiers)
@@ -6079,9 +6082,6 @@ ignored.
 See also `same-window-regexps'."
  :type '(repeat (string :format "%v"))
  :group 'windows)
-;; (make-obsolete-variable
- ;; 'same-window-buffer-names
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom same-window-regexps nil
   "List of regexps saying which buffers should appear in the \"same\" window.
@@ -6097,9 +6097,6 @@ the buffer name.  This is for compatibility with
 See also `same-window-buffer-names'."
   :type '(repeat (regexp :format "%v"))
   :group 'windows)
-;; (make-obsolete-variable
- ;; 'same-window-regexps
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun same-window-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
@@ -6124,8 +6121,6 @@ selected rather than \(as usual\) some other window.  See
                     (and (consp regexp) (stringp (car regexp))
                          (string-match-p (car regexp) buffer-name)))
             (throw 'found t))))))))
-;; (make-obsolete
- ;; 'same-window-p "pass argument to buffer display function instead." "24.1")
 
 (defcustom special-display-frame-alist
   '((height . 14) (width . 80) (unsplittable . t))
@@ -6143,9 +6138,6 @@ These supersede the values given in `default-frame-alist'."
                          (symbol :tag "Parameter")
                          (sexp :tag "Value")))
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-frame-alist
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-popup-frame (buffer &optional args)
   "Display BUFFER in a special frame and return the window chosen.
@@ -6191,9 +6183,6 @@ and (cdr ARGS) as the rest of the arguments."
          (set-window-buffer (frame-selected-window frame) buffer)
          (set-window-dedicated-p (frame-selected-window frame) t)
          (frame-selected-window frame))))))
-;; (make-obsolete
- ;; 'special-display-popup-frame
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-function 'special-display-popup-frame
   "Function to call for displaying special buffers.
@@ -6210,9 +6199,6 @@ A buffer is special when its name is either listed in
   :type 'function
   :group 'windows
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-function
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-buffer-names nil
   "List of names of buffers that should be displayed specially.
@@ -6277,9 +6263,6 @@ See also `special-display-regexps'."
                         (repeat :tag "Arguments" (sexp)))))
   :group 'windows
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-buffer-names
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 ;;;###autoload
 (put 'special-display-buffer-names 'risky-local-variable t)
@@ -6348,9 +6331,6 @@ See also `special-display-buffer-names'."
                         (repeat :tag "Arguments" (sexp)))))
   :group 'windows
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'special-display-regexps
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME gets a special frame.
@@ -6378,9 +6358,6 @@ entry."
            ((and (consp regexp) (stringp (car regexp))
                  (string-match-p (car regexp) buffer-name))
             (throw 'found (cdr regexp))))))))))
-;; (make-obsolete
- ;; 'special-display-p
- ;; "pass argument to buffer display function instead." "24.1")
 
 (defcustom pop-up-frame-alist nil
   "Alist of parameters for automatically generated new frames.
@@ -6400,9 +6377,6 @@ affected by this variable."
                        (symbol :tag "Parameter")
                        (sexp :tag "Value")))
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frame-alist
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frame-function
   (lambda () (make-frame pop-up-frame-alist))
@@ -6412,9 +6386,6 @@ frame.  The default value calls `make-frame' with the argument
 `pop-up-frame-alist'."
   :type 'function
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frame-function
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frames nil
   "Whether `display-buffer' should make a separate frame.
@@ -6428,9 +6399,6 @@ Any other non-nil value means always make a separate frame."
           (const :tag "Always" t))
   :group 'windows
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frames
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom display-buffer-reuse-frames nil
   "Set and non-nil means `display-buffer' should reuse frames.
@@ -6440,17 +6408,11 @@ that frame."
   :version "21.1"
   :group 'windows
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'display-buffer-reuse-frames
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-windows t
   "Non-nil means `display-buffer' should make a new window."
   :type 'boolean
   :group 'windows)
-;; (make-obsolete-variable
- ;; 'pop-up-windows
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-window-preferred-function 'split-window-sensibly
   "Function called by `display-buffer' to split a window.
@@ -6477,9 +6439,6 @@ not want to split the selected window."
   :type 'function
   :version "23.1"
   :group 'windows)
-;; (make-obsolete-variable
- ;; 'split-window-preferred-function
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-height-threshold 80
   "Minimum height for splitting a window to display a buffer.
@@ -6491,9 +6450,6 @@ split it vertically disregarding the value of this variable."
   :type '(choice (const nil) (integer :tag "lines"))
   :version "23.1"
   :group 'windows)
-;; (make-obsolete-variable
- ;; 'split-height-threshold
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-width-threshold 160
   "Minimum width for splitting a window to display a buffer.
@@ -6503,9 +6459,6 @@ is nil, `display-buffer' cannot split windows horizontally."
   :type '(choice (const nil) (integer :tag "columns"))
   :version "23.1"
   :group 'windows)
-;; (make-obsolete-variable
- ;; 'split-width-threshold
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom even-window-heights t
   "If non-nil `display-buffer' will try to even window heights.
@@ -6514,17 +6467,11 @@ alone.  Heights are evened only when `display-buffer' chooses a
 window that appears above or below the selected window."
   :type 'boolean
   :group 'windows)
-;; (make-obsolete-variable
- ;; 'even-window-heights
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defvar display-buffer-mark-dedicated nil
   "Non-nil means `display-buffer' marks the windows it creates as dedicated.
 The actual non-nil value of this variable will be copied to the
 `window-dedicated-p' flag.")
-;; (make-obsolete-variable
- ;; 'display-buffer-mark-dedicated
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun window-splittable-p (window &optional horizontal)
   "Return non-nil if `split-window-sensibly' may split WINDOW.
@@ -6575,8 +6522,6 @@ hold:
                  (max split-height-threshold
                       (* 2 (max window-min-height
                                 (if mode-line-format 2 1))))))))))
-;; (make-obsolete
- ;; 'window-splittable-p "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun split-window-sensibly (window)
   "Split WINDOW in a way suitable for `display-buffer'.
@@ -6626,8 +6571,6 @@ split."
              (when (with-no-warnings (window-splittable-p window))
                (with-selected-window window
                  (split-window-vertically)))))))
-;; (make-obsolete
- ;; 'split-window-sensibly "use 2nd arg of `display-buffer' instead." "24.1")
 
 ;; Functions for converting Emacs 23 buffer display options to buffer
 ;; display specifiers.
@@ -7531,6 +7474,8 @@ Otherwise, consult the value of `truncate-partial-width-windows'
           (< (window-width window) t-p-w-w)
         t-p-w-w))))
 
+;; Some of these are in tutorial--default-keys, so update that if you
+;; change these.
 (define-key ctl-x-map "0" 'delete-window)
 (define-key ctl-x-map "1" 'delete-other-windows)
 (define-key ctl-x-map "2" 'split-window-above-each-other)
diff --git a/src/ChangeLog b/src/ChangeLog
index 85a55b2b7c9..82d75d39b40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * eval.c (Fsignal): Handle `debug' symbol in error handler (Bug#9329).
+        (Fcondition_case): Document `debug' symbol in error handler.
+
 2011-08-19  Eli Zaretskii  <eliz@gnu.org>
 
         * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of
diff --git a/src/eval.c b/src/eval.c
index e37425020c9..372e9954620 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1357,8 +1357,12 @@ A handler is applicable to an error
 if CONDITION-NAME is one of the error's condition names.
 If an error happens, the first applicable handler is run.
 
-The car of a handler may be a list of condition names
-instead of a single condition name.  Then it handles all of them.
+The car of a handler may be a list of condition names instead of a
+single condition name; then it handles all of them.  If the special
+condition name `debug' is present in this list, it allows another
+condition in the list to run the debugger if `debug-on-error' and the
+other usual mechanisms says it should (otherwise, `condition-case'
+suppresses the debugger).
 
 When a handler handles an error, control returns to the `condition-case'
 and it executes the handler's BODY...
@@ -1699,6 +1703,10 @@ See also the function `condition-case'.  */)
       && (!NILP (Vdebug_on_signal)
           /* If no handler is present now, try to run the debugger.  */
           || NILP (clause)
+          /* A `debug' symbol in the handler list disables the normal
+             suppression of the debugger.  */
+          || (CONSP (clause) && CONSP (XCAR (clause))
+              && !NILP (Fmemq (Qdebug, XCAR (clause))))
           /* Special handler that means "print a message and run debugger
              if requested".  */
           || EQ (h->handler, Qerror)))