Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6783e8431109a5a91c6e694de6413b97dd141379..7a9a6bc818cf51ff2893c2620308f12d33139f30 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-19  Chong Yidong  <cyd@gnu.org>
+
+       * emacs.texi: Update ISBN.
+
 2012-07-17  Chong Yidong  <cyd@gnu.org>
 
        * basic.texi (Inserting Text): Replace ucs-insert with

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 6b39803f7d058f27cbeee663b57ca2d16c4ccd53..1b457e019436eb192849806b88006560f15335ab 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -94,7 +94,7 @@ developing GNU and promoting software freedom.''
 Published by the Free Software Foundation @*
 51 Franklin Street, Fifth Floor @*
 Boston, MA 02110-1301 USA @*
-ISBN 978-0-9831592-2-3
+ISBN 978-0-9831592-3-0
 
 @sp 2
 Cover art by Etienne Suvasa; cover design by Matt Lee.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5f0de2d4c70f6eace755ee1788465079906e411..6435eeeb78a5ce1262987da0d1566c0a6898271d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2012-07-21  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/cc-cmds.el (c-defun-name): Use
+       match-string-no-properties instead for consistency.
+
+2012-07-20  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/cc-cmds.el (c-defun-name): Handle objc selectors properly.
+       (Bug#7879)
+
+       * progmodes/cc-langs.el (c-symbol-start): Include char _ (bug#11986).
+
+2012-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * userlock.el, emacs-lisp/map-ynp.el: Declare part of `emacs' package.
+       * progmodes/bug-reference.el, misearch.el: Provide themselves
+       (bug#11915).
+
+       * progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
+       of narrowed buffer (bug#11966).
+
 2012-07-20  Vincent Belaïche  <vincentb1@users.sourceforge.net>
 
        * ses.el (ses-rename-cell): Set new name also in reference list of

diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index cc4e642daf89f9e8f7b57118e7302ccfc16a593a..e7806440bf3edfe3aae2ebfc8ec1212277313eca 100644 (file)
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -5,6 +5,7 @@
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
 ;; Keywords: lisp, extensions
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/misearch.el b/lisp/misearch.el
index 4848b6691bcb786556bedda62014e25491a611ed..502de52a05fad315f6d6d100483ff3dd4f86b061 100644 (file)
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -373,5 +373,5 @@ whose file names match the specified wildcard."
 
 \f
 (provide 'multi-isearch)
-
+(provide 'misearch)
 ;;; misearch.el ends here

diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 48ef5da12aee5e3243906356a24c2bdc3525f2f6..0a7d65c1fa4da98f2a1fdfcc2236248b08838eb4 100644 (file)
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -30,6 +30,8 @@
 ;; Two minor modes are provided.  One works on any text in the buffer;
 ;; the other operates only on comments and strings.
 
+;;; Code:
+
 (defvar bug-reference-map
   (let ((map (make-sparse-keymap)))
     (define-key map [mouse-2] 'bug-reference-push-button)
@@ -154,4 +156,5 @@ the mode if ARG is omitted or nil."
       (widen)
       (bug-reference-unfontify (point-min) (point-max)))))
 
+(provide 'bug-reference)
 ;;; bug-reference.el ends here

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 94b296bf59e824c1124905161bf693ee35733be6..7cd0a0b0ae21c0c306c290210d8b51fbacf4dfbc 100644 (file)
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1826,14 +1826,16 @@ with a brace block."
            ;; DEFFLAGSET(syslog_opt_flags,LOG_PID ...) ==> syslog_opt_flags
            (match-string-no-properties 1))
 
-          ;; Objective-C method starting with + or -.
-          ((and (derived-mode-p 'objc-mode)
-                (looking-at "[-+]\s*("))
-           (when (c-syntactic-re-search-forward ")\s*" nil t)
-             (c-forward-token-2)
-             (setq name-end (point))
-             (c-backward-token-2)
-             (buffer-substring-no-properties (point) name-end)))
+          ;; Objc selectors.
+          ((assq 'objc-method-intro (c-guess-basic-syntax))
+           (let ((bound (save-excursion (c-end-of-statement) (point)))
+                 (kw-re (concat "\\(?:" c-symbol-key "\\)?:"))
+                 (stretches))
+             (when (c-syntactic-re-search-forward c-symbol-key bound t t t)
+               (push (match-string-no-properties 0) stretches)
+               (while (c-syntactic-re-search-forward kw-re bound t t t)
+                 (push (match-string-no-properties 0) stretches)))
+             (apply 'concat (nreverse stretches))))
 
           (t
            ;; Normal function or initializer.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 493f3db0961aeb18d3aaa3b273282a71f2639d6d..78be8ac2cc4f2c28f82ca81678d755a993c25cb8 100644 (file)
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -578,7 +578,7 @@ keyword.  It's unspecified how far it matches.      Does not contain a \\|
 operator at the top level."
   t    (concat "[" c-alpha "_]")
   java (concat "[" c-alpha "_@]")
-  objc (concat "[" c-alpha "@]")
+  objc (concat "[" c-alpha "_@]")
   pike (concat "[" c-alpha "_`]"))
 (c-lang-defvar c-symbol-start (c-lang-const c-symbol-start))
 

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index f04994249527a4951a852676b3d7e0625eae4cda..d9b50ea3cc35182a1a868ef6cac026d0a72eb3a5 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3497,7 +3497,8 @@ Works before syntax recognition is done."
     (if end
        ;; Do the same for end, going small steps
        (save-excursion
-         (while (and end (get-text-property end 'syntax-type))
+         (while (and end (< end (point-max))
+                     (get-text-property end 'syntax-type))
            (setq pos end
                  end (next-single-property-change end 'syntax-type nil (point-max)))
            (if end (progn (goto-char end)

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 8a4159aafc0895a79bfede5fa13a96b02015051c..705d9588249f59e44a661f1577fd5b03c6ad6367 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -4,6 +4,7 @@
 
 ;; Maintainer: FSF
 ;; Keywords: internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 

diff --git a/src/window.c b/src/window.c
index 7fd66057ad27c0755ed7edbc29e58c80d4d14659..3bf73134468dd03b70e2470259dcee65c85a9e9d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -484,9 +484,7 @@ for future use.  */)
   (Lisp_Object window, Lisp_Object limit)
 {
   register struct window *w = decode_any_window (window);
-
   w->combination_limit = limit;
-
   return w->combination_limit;
 }