upstream

6 files changed, 108 insertions, 48 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a9b1808cdf..d8342df4da5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2012-03-07  Michael Albinus  <Michael.Albinus@alcatel-lucent.com>
+
+        Avoid superfluous registering of signals.  (Bug#10807)
+
+        * notifications.el (notifications-on-action-object)
+        (notifications-on-close-object): New defvars.
+        (notifications-on-action-signal, notifications-on-closed-signal):
+        Unregister the signal if not needed any longer.
+        (notifications-notify): Register `notifications-action-signal' or
+        `notifications-closed-signal', if :on-action or :on-close has been
+        passed as argument.
+
+2012-03-07  Chong Yidong  <cyd@gnu.org>
+
+        * cus-start.el: Avoid x-select-enable-clipboard-manager warning on
+        non-X platforms.
+
+2012-03-06  Glenn Morris  <rgm@gnu.org>
+
+        * term/pc-win.el (x-selection-owner-p, x-own-selection-internal)
+        (x-disown-selection-internal, x-get-selection-internal):
+        Doc fix (add arglist signatures).  (Bug#10783)
+
+2012-03-06  Kaushik Srenevasan  <ksrenevasan@gmail.com>  (tiny change)
+
+        * progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):
+        Handle breakpoints with no "type".
+
+2012-03-06  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (locate-dominating-file): Add optional predicate argument.
+        (dir-locals-find-file): Make use of above change.
+
 2012-03-06  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
         * info.el (Info-insert-dir): Also try "dir.gz".
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index a2ac7aa91e6..fbba49951d1 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -502,6 +502,8 @@ since it could result in memory overflow and make Emacs crash."
                        (featurep 'ns))
                       ((string-match "\\`x-.*gtk" (symbol-name symbol))
                        (featurep 'gtk))
+                      ((string-match "clipboard-manager" (symbol-name symbol))
+                       (boundp 'x-select-enable-clipboard-manager))
                       ((string-match "\\`x-" (symbol-name symbol))
                        (fboundp 'x-create-frame))
                       ((string-match "selection" (symbol-name symbol))
diff --git a/lisp/files.el b/lisp/files.el
index fae834daefe..1d54ef81869 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -877,13 +877,14 @@ or mount points potentially requiring authentication as a different user.")
 ;;               (setq dir nil))))
 ;;       nil)))
 
-(defun locate-dominating-file (file name)
+(defun locate-dominating-file (file name &optional predicate)
   "Look up the directory hierarchy from FILE for a file named NAME.
 Stop at the first parent directory containing a file NAME,
 and return the directory.  Return nil if not found.
 
-This function only tests if FILE exists.  If you care about whether
-it is readable, regular, etc., you should test the result."
+Optional argument PREDICATE is a function of one argument, a file.
+It should return non-nil if the file is acceptable.  The default is
+`file-exists-p'; you might, e.g., want to use `file-readable-p' instead."
   ;; We used to use the above locate-dominating-files code, but the
   ;; directory-files call is very costly, so we're much better off doing
   ;; multiple calls using the code in here.
@@ -910,11 +911,8 @@ it is readable, regular, etc., you should test the result."
                     ;;   (setq user (nth 2 (file-attributes file)))
                     ;;   (and prev-user (not (equal user prev-user))))
                     (string-match locate-dominating-stop-dir-regexp file)))
-      ;; FIXME? maybe this function should (optionally?)
-      ;; use file-readable-p instead.  In many cases, an unreadable
-      ;; FILE is no better than a non-existent one.
-      ;; See eg dir-locals-find-file.
-      (setq try (file-exists-p (expand-file-name name file)))
+      (setq try (funcall (or predicate 'file-exists-p)
+                         (expand-file-name name file)))
       (cond (try (setq root file))
             ((equal file (setq file (file-name-directory
                                      (directory-file-name file))))
@@ -3552,7 +3550,7 @@ across different environments and users.")
   "Find the directory-local variables for FILE.
 This searches upward in the directory tree from FILE.
 It stops at the first directory that has been registered in
-`dir-locals-directory-cache' or contains a `dir-locals-file'.
+`dir-locals-directory-cache' or contains a readable `dir-locals-file'.
 If it finds an entry in the cache, it checks that it is valid.
 A cache entry with no modification time element (normally, one that
 has been assigned directly using `dir-locals-set-directory-class', not
@@ -3570,17 +3568,15 @@ of no valid cache entry."
           (if (eq system-type 'ms-dos)
               (dosified-file-name dir-locals-file)
             dir-locals-file))
-         (locals-file (locate-dominating-file file dir-locals-file-name))
+         ;; FIXME?  Is it right to silently ignore unreadable files?
+         (locals-file (locate-dominating-file file dir-locals-file-name
+                                              (lambda (file)
+                                                (and (file-readable-p file)
+                                                     (file-regular-p file)))))
          (dir-elt nil))
     ;; `locate-dominating-file' may have abbreviated the name.
-    (and locals-file
-         (setq locals-file (expand-file-name dir-locals-file-name locals-file))
-         ;; FIXME? is it right to silently ignore an unreadable file?
-         ;; Maybe we'd want to keep searching in that case.
-         ;; That is a locate-dominating-file issue.
-         (or (not (file-readable-p locals-file))
-             (not (file-regular-p locals-file)))
-         (setq locals-file nil))
+    (if locals-file
+        (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
     ;; Find the best cached value in `dir-locals-directory-cache'.
     (dolist (elt dir-locals-directory-cache)
       (when (and (eq t (compare-strings file nil (length (car elt))
diff --git a/lisp/notifications.el b/lisp/notifications.el
index 1b75c2c5702..908cbcaabab 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -88,25 +88,26 @@
 (defvar notifications-on-action-map nil
   "Mapping between notification and action callback functions.")
 
+(defvar notifications-on-action-object nil
+  "Object for registered on-action signal.")
+
 (defvar notifications-on-close-map nil
   "Mapping between notification and close callback functions.")
 
+(defvar notifications-on-close-object nil
+  "Object for registered on-close signal.")
+
 (defun notifications-on-action-signal (id action)
   "Dispatch signals to callback functions from `notifications-on-action-map'."
   (let* ((unique-name (dbus-event-service-name last-input-event))
          (entry (assoc (cons unique-name id) notifications-on-action-map)))
     (when entry
       (funcall (cadr entry) id action)
-      (remove entry notifications-on-action-map))))
-
-(when (fboundp 'dbus-register-signal)
-  (dbus-register-signal
-   :session
-   nil
-   notifications-path
-   notifications-interface
-   notifications-action-signal
-   'notifications-on-action-signal))
+      (when (and (not (setq notifications-on-action-map
+                            (remove entry notifications-on-action-map)))
+                 notifications-on-action-object)
+        (dbus-unregister-object notifications-on-action-object)
+        (setq notifications-on-action-object nil)))))
 
 (defun notifications-on-closed-signal (id &optional reason)
   "Dispatch signals to callback functions from `notifications-on-closed-map'."
@@ -118,16 +119,11 @@
     (when entry
       (funcall (cadr entry)
                id (cadr (assoc reason notifications-closed-reason)))
-      (remove entry notifications-on-close-map))))
-
-(when (fboundp 'dbus-register-signal)
-  (dbus-register-signal
-   :session
-   nil
-   notifications-path
-   notifications-interface
-   notifications-closed-signal
-   'notifications-on-closed-signal))
+      (when (and (not (setq notifications-on-close-map
+                            (remove entry notifications-on-close-map)))
+                 notifications-on-close-object)
+        (dbus-unregister-object notifications-on-close-object)
+        (setq notifications-on-close-object nil)))))
 
 (defun notifications-notify (&rest params)
   "Send notification via D-Bus using the Freedesktop notification protocol.
@@ -287,10 +283,29 @@ used to manipulate the notification item with
           (unique-name (dbus-get-name-owner :session notifications-service)))
       (when on-action
         (add-to-list 'notifications-on-action-map
-                     (list (cons unique-name id) on-action)))
+                     (list (cons unique-name id) on-action))
+        (unless notifications-on-action-object
+          (setq notifications-on-action-object
+                (dbus-register-signal
+                 :session
+                 nil
+                 notifications-path
+                 notifications-interface
+                 notifications-action-signal
+                 'notifications-on-action-signal))))
+
       (when on-close
         (add-to-list 'notifications-on-close-map
-                     (list (cons unique-name id) on-close))))
+                     (list (cons unique-name id) on-close))
+        (unless notifications-on-close-object
+          (setq notifications-on-close-object
+                (dbus-register-signal
+                 :session
+                 nil
+                 notifications-path
+                 notifications-interface
+                 notifications-closed-signal
+                 'notifications-on-closed-signal)))))
 
     ;; Return notification id
     id))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 0c45c3f5e5d..8ea255e49dd 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2397,15 +2397,15 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
         (gdb-table-add-row table
                            (list
                             (bindat-get-field breakpoint 'number)
-                            type
-                            (bindat-get-field breakpoint 'disp)
+                            (or type "")
+                            (or (bindat-get-field breakpoint 'disp) "")
                             (let ((flag (bindat-get-field breakpoint 'enabled)))
                               (if (string-equal flag "y")
                                   (propertize "y" 'font-lock-face  font-lock-warning-face)
                                 (propertize "n" 'font-lock-face  font-lock-comment-face)))
                             (bindat-get-field breakpoint 'addr)
-                            (bindat-get-field breakpoint 'times)
-                            (if (string-match ".*watchpoint" type)
+                            (or (bindat-get-field breakpoint 'times) "")
+                            (if (and type (string-match ".*watchpoint" type))
                                 (bindat-get-field breakpoint 'what)
                               (or pending at
                                   (concat "in "
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index fc86d4179b6..b460e3b8a14 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -159,6 +159,12 @@ created."
 ;; returned value matters.  Also, by the way, recall that `ignore' is
 ;; a useful function for returning 'nil regardless of argument.
 
+;; Note: Any re-definition in this file of a function that is defined
+;; in C on other platforms, should either have no doc-string, or one
+;; that is identical to the C version, but with the arglist signature
+;; at the end.  Otherwise help-split-fundoc gets confused on other
+;; platforms.  (Bug#10783)
+
 ;; From src/xfns.c
 (defun x-list-fonts (pattern &optional face frame maximum width)
   (if (or (null width) (and (numberp width) (= width 1)))
@@ -261,7 +267,9 @@ TERMINAL should be a terminal object or a frame specifying the X
 server to query.  If omitted or nil, that stands for the selected
 frame's display, or the first available X display.
 
-On Nextstep, TERMINAL is unused."
+On Nextstep, TERMINAL is unused.
+
+\(fn &optional SELECTION TERMINAL)"
     (if x-select-enable-clipboard
       (let (text)
         ;; Don't die if w16-get-clipboard-data signals an error.
@@ -289,7 +297,9 @@ anything that the functions on `selection-converter-alist' know about.
 FRAME should be a frame that should own the selection.  If omitted or
 nil, it defaults to the selected frame.
 
-On Nextstep, FRAME is unused."
+On Nextstep, FRAME is unused.
+
+\(fn SELECTION VALUE &optional FRAME)"
   (ignore-errors
     (x-select-text value))
   value)
@@ -306,7 +316,9 @@ server to query.  If omitted or nil, that stands for the selected
 frame's display, or the first available X display.
 
 On Nextstep, the TIME-OBJECT and TERMINAL arguments are unused.
-On MS-DOS, all this does is return non-nil if we own the selection."
+On MS-DOS, all this does is return non-nil if we own the selection.
+
+\(fn SELECTION &optional TIME-OBJECT TERMINAL)"
   (if (x-selection-owner-p selection)
       t))
 
@@ -324,7 +336,9 @@ TERMINAL should be a terminal object or a frame specifying the X
 server to query.  If omitted or nil, that stands for the selected
 frame's display, or the first available X display.
 
-On Nextstep, TIME-STAMP and TERMINAL are unused."
+On Nextstep, TIME-STAMP and TERMINAL are unused.
+
+\(fn SELECTION-SYMBOL TARGET-TYPE &optional TIME-STAMP TERMINAL)"
   (x-get-selection-value))
 
 ;; From src/fontset.c: