[Emacs-diffs] /srv/bzr/emacs/trunk r109172: Merge from emacs-24 branch; up to r108077

[Chong Yidong]

------------------------------------------------------------
revno: 109172 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-21 14:14:00 +0800
message:
  Merge from emacs-24 branch; up to r108077
modified:
  doc/emacs/ChangeLog
  doc/emacs/emacs.texi
  lisp/ChangeLog
  lisp/emacs-lisp/map-ynp.el
  lisp/misearch.el
  lisp/progmodes/bug-reference.el
  lisp/progmodes/cc-cmds.el
  lisp/progmodes/cc-langs.el
  lisp/progmodes/cperl-mode.el
  lisp/userlock.el
  src/window.c

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-07-17 07:43:01 +0000
+++ b/doc/emacs/ChangeLog       2012-07-21 06:13:23 +0000
@@ -1,3 +1,7 @@
+2012-07-19  Chong Yidong  <address@hidden>
+
+       * emacs.texi: Update ISBN.
+
 2012-07-17  Chong Yidong  <address@hidden>
 
        * basic.texi (Inserting Text): Replace ucs-insert with

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2012-07-06 04:48:35 +0000
+++ b/doc/emacs/emacs.texi      2012-07-21 06:13:23 +0000
@@ -94,7 +94,7 @@
 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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-20 21:09:04 +0000
+++ b/lisp/ChangeLog    2012-07-21 06:13:23 +0000
@@ -1,3 +1,24 @@
+2012-07-21  Leo Liu  <address@hidden>
+
+       * progmodes/cc-cmds.el (c-defun-name): Use
+       match-string-no-properties instead for consistency.
+
+2012-07-20  Leo Liu  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ses.el (ses-rename-cell): Set new name also in reference list of

=== modified file 'lisp/emacs-lisp/map-ynp.el'
--- a/lisp/emacs-lisp/map-ynp.el        2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/map-ynp.el        2012-07-18 11:44:13 +0000
@@ -5,6 +5,7 @@
 ;; Author: Roland McGrath <address@hidden>
 ;; Maintainer: FSF
 ;; Keywords: lisp, extensions
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 

=== modified file 'lisp/misearch.el'
--- a/lisp/misearch.el  2012-05-29 09:09:38 +0000
+++ b/lisp/misearch.el  2012-07-21 06:13:23 +0000
@@ -373,5 +373,5 @@
 
 
 (provide 'multi-isearch)
-
+(provide 'misearch)
 ;;; misearch.el ends here

=== modified file 'lisp/progmodes/bug-reference.el'
--- a/lisp/progmodes/bug-reference.el   2012-07-03 02:16:11 +0000
+++ b/lisp/progmodes/bug-reference.el   2012-07-21 06:13:23 +0000
@@ -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 @@
       (widen)
       (bug-reference-unfontify (point-min) (point-max)))))
 
+(provide 'bug-reference)
 ;;; bug-reference.el ends here

=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2012-07-14 09:08:36 +0000
+++ b/lisp/progmodes/cc-cmds.el 2012-07-21 06:13:23 +0000
@@ -1826,14 +1826,16 @@
            ;; 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.

=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el        2012-03-02 22:16:21 +0000
+++ b/lisp/progmodes/cc-langs.el        2012-07-20 11:36:41 +0000
@@ -578,7 +578,7 @@
 operator at the top level."
   t    (concat "[" c-alpha "_]")
   java (concat "[" c-alpha "address@hidden")
-  objc (concat "[" c-alpha "@]")
+  objc (concat "[" c-alpha "address@hidden")
   pike (concat "[" c-alpha "_`]"))
 (c-lang-defvar c-symbol-start (c-lang-const c-symbol-start))
 

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2012-06-29 06:28:37 +0000
+++ b/lisp/progmodes/cperl-mode.el      2012-07-21 06:13:23 +0000
@@ -3497,7 +3497,8 @@
     (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)

=== modified file 'lisp/userlock.el'
--- a/lisp/userlock.el  2012-01-19 07:21:25 +0000
+++ b/lisp/userlock.el  2012-07-18 11:44:13 +0000
@@ -4,6 +4,7 @@
 
 ;; Maintainer: FSF
 ;; Keywords: internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 

=== modified file 'src/window.c'
--- a/src/window.c      2012-07-10 16:53:26 +0000
+++ b/src/window.c      2012-07-21 06:13:23 +0000
@@ -484,9 +484,7 @@
   (Lisp_Object window, Lisp_Object limit)
 {
   register struct window *w = decode_any_window (window);
-
   w->combination_limit = limit;
-
   return w->combination_limit;
 }