Merge from emacs-24 branch; up to 2012-05-01T18:47:23Z!rgm@gnu.org

7 files changed, 46 insertions, 27 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7a9a6bc818c..c753ab5a1a2 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * frames.texi (Mouse Commands): Fix the description of mouse-2.
+        (Bug#11958)
+
 2012-07-19  Chong Yidong  <cyd@gnu.org>
 
         * emacs.texi: Update ISBN.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index fee91d370c3..e1b849e630e 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -81,8 +81,8 @@ Activate the region around the text selected by dragging, and copy it
 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
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 58bce13ba9d..d2312db1801 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * faq.texi (Right-to-left alphabets): Update for Emacs 24.
+        (Bug#12073)
+
 2012-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Prefer typical American spelling for "acknowledgment".
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 9bb3feb52e1..2983667c5cd 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -4044,13 +4044,13 @@ Emacs Manual}.  For more sophisticated methods,
 @cindex Right-to-left alphabets
 @cindex Hebrew, handling with Emacs
 @cindex Semitic alphabets
-@cindex Arabic alphabets
-@cindex Bidirectional text
+@cindex Arabic
+@cindex Farsi
+@cindex 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
-@uref{http://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.
+@xref{New in Emacs 24, bidirectional display}.
 
 
 @node How to add fonts
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f31218506ba..24477cf87ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-28  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gdb-mi.el (gdb-place-breakpoints): Fix the call to
+        gdb-get-location.
+
+2012-07-25  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/cc-menus.el (cc-imenu-objc-function): Avoid leaving nil in
+        the alist (bug#12029).
+
 2012-07-28  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (custom-deps, finder-data, updates, compile)
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index a53d65f6307..76e3002abd2 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -399,14 +399,10 @@ Example:
                 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)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 23a34b85194..80afdc0bedf 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2487,20 +2487,23 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
         (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=\"\\(.*?\\)\"")