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

[Chong Yidong]

------------------------------------------------------------
revno: 109249 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-28 23:12:37 +0800
message:
  Merge from emacs-24 branch; up to r108082
modified:
  doc/emacs/ChangeLog
  doc/emacs/frames.texi
  doc/misc/ChangeLog
  doc/misc/faq.texi
  lisp/ChangeLog
  lisp/progmodes/cc-menus.el
  lisp/progmodes/gdb-mi.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-07-21 06:13:23 +0000
+++ b/doc/emacs/ChangeLog       2012-07-28 15:12:12 +0000
@@ -1,3 +1,8 @@
+2012-07-21  Eli Zaretskii  <address@hidden>
+
+       * frames.texi (Mouse Commands): Fix the description of mouse-2.
+       (Bug#11958)
+
 2012-07-19  Chong Yidong  <address@hidden>
 
        * emacs.texi: Update ISBN.

=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi     2012-06-17 05:13:40 +0000
+++ b/doc/emacs/frames.texi     2012-07-28 15:12:12 +0000
@@ -81,8 +81,8 @@
 to the kill ring (@code{mouse-set-region}).
 
 @item Mouse-2
-Yank the last killed text at the click position
-(@code{mouse-yank-at-click}).
+Move point to where you click, and insert the contents of the primary
+selection there (@code{mouse-yank-primary}).
 
 @item Mouse-3
 If the region is active, move the nearer end of the region to the

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-07-25 05:48:19 +0000
+++ b/doc/misc/ChangeLog        2012-07-28 15:12:12 +0000
@@ -1,3 +1,8 @@
+2012-07-28  Eli Zaretskii  <address@hidden>
+
+       * faq.texi (Right-to-left alphabets): Update for Emacs 24.
+       (Bug#12073)
+
 2012-07-25  Paul Eggert  <address@hidden>
 
        Prefer typical American spelling for "acknowledgment".

=== modified file 'doc/misc/faq.texi'
--- a/doc/misc/faq.texi 2012-04-28 19:04:01 +0000
+++ b/doc/misc/faq.texi 2012-07-28 07:38:32 +0000
@@ -4044,13 +4044,13 @@
 @cindex Right-to-left alphabets
 @cindex Hebrew, handling with Emacs
 @cindex Semitic alphabets
address@hidden Arabic alphabets
address@hidden Bidirectional text
address@hidden Arabic
address@hidden Farsi
address@hidden bidirectional scripts
 
-Emacs supports Hebrew characters (ISO 8859-8) since version 20, but does
-not yet support right-to-left character entry and display.  The
address@hidden://lists.gnu.org/mailman/listinfo/emacs-bidi, emacs-bidi
-mailing list} discusses development of support for this feature.
+Emacs supports display and editing of bidirectional scripts, such as
+Arabic, Farsi, and Hebrew, since version 24.1.
address@hidden in Emacs 24, bidirectional display}.
 
 
 @node How to add fonts

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-28 14:18:51 +0000
+++ b/lisp/ChangeLog    2012-07-28 15:12:12 +0000
@@ -1,3 +1,13 @@
+2012-07-28  Chong Yidong  <address@hidden>
+
+       * progmodes/gdb-mi.el (gdb-place-breakpoints): Fix the call to
+       gdb-get-location.
+
+2012-07-25  Leo Liu  <address@hidden>
+
+       * progmodes/cc-menus.el (cc-imenu-objc-function): Avoid leaving nil in
+       the alist (bug#12029).
+
 2012-07-28  Eli Zaretskii  <address@hidden>
 
        * makefile.w32-in (custom-deps, finder-data, updates, compile)

=== modified file 'lisp/progmodes/cc-menus.el'
--- a/lisp/progmodes/cc-menus.el        2012-04-11 18:09:10 +0000
+++ b/lisp/progmodes/cc-menus.el        2012-07-25 16:11:23 +0000
@@ -399,14 +399,10 @@
                str2 "@protocol")))
        (setq str (cc-imenu-objc-remove-white-space str))
        (setq methodlist (cons (cons str2
-                             (match-beginning langnum))
+                                    (match-beginning langnum))
                               methodlist))
-       (setq toplist (cons nil (cons (cons str
-                                         methodlist) toplist))
+       (setq toplist (cons (cons str methodlist) toplist)
              methodlist nil))))
-    ;;
-    (if (eq (car toplist) nil)
-       (setq toplist (cdr toplist)))
 
     ;; In this buffer, there is only one or zero 
@{interface|implementation|protocol}.
     (if (< classcount 2)

=== modified file 'lisp/progmodes/gdb-mi.el'
--- a/lisp/progmodes/gdb-mi.el  2012-07-11 23:13:41 +0000
+++ b/lisp/progmodes/gdb-mi.el  2012-07-28 15:12:12 +0000
@@ -2487,20 +2487,23 @@
         (let ((file (bindat-get-field breakpoint 'fullname))
               (flag (bindat-get-field breakpoint 'enabled))
               (bptno (bindat-get-field breakpoint 'number)))
-          (unless (file-exists-p file)
+          (unless (and file (file-exists-p file))
             (setq file (cdr (assoc bptno gdb-location-alist))))
-          (if (and file
-                   (not (string-equal file "File not found")))
-              (with-current-buffer
-                  (find-file-noselect file 'nowarn)
-                (gdb-init-buffer)
-                ;; Only want one breakpoint icon at each location.
-                (gdb-put-breakpoint-icon (string-equal flag "y") bptno
-                                         (string-to-number line)))
-            (gdb-input (concat "list " file ":1") 'ignore)
-            (gdb-input "-file-list-exec-source-file"
-                      `(lambda () (gdb-get-location
-                                   ,bptno ,line ,flag)))))))))
+         (if (or (null file)
+                 (string-equal file "File not found"))
+             ;; If the full filename is not recorded in the
+             ;; breakpoint structure or in `gdb-location-alist', use
+             ;; -file-list-exec-source-file to extract it.
+             (when (setq file (bindat-get-field breakpoint 'file))
+               (gdb-input (concat "list " file ":1") 'ignore)
+               (gdb-input "-file-list-exec-source-file"
+                          `(lambda () (gdb-get-location
+                                       ,bptno ,line ,flag))))
+           (with-current-buffer (find-file-noselect file 'nowarn)
+             (gdb-init-buffer)
+             ;; Only want one breakpoint icon at each location.
+             (gdb-put-breakpoint-icon (string-equal flag "y") bptno
+                                      (string-to-number line)))))))))
 
 (defvar gdb-source-file-regexp "fullname=\"\\(.*?\\)\"")