4 files changed, 24 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b223382b271..d1348485002 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2011-05-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * smerge-mode.el (smerge-resolve): Use null-device rather than a
+        literal "/dev/null".
+
+2011-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):
+        Fix typo.
+
+2011-05-12  Ralph Schleicher  <rs@ralph-schleicher.de>
+
+        * progmodes/which-func.el (which-function):
+        Use add-log-current-defun instead of add-log-current-defun-function,
+        which might not be defined (Bug#8260).
+
 2011-05-12  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index deb06f52549..ef0c49b8616 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -636,8 +636,8 @@ considered."
          (plist (nthcdr 3 data)))
     (if (null data)
         (minibuffer-message "Nothing to complete")
-      (let ((completion-annotate-function
-             (plist-get plist :annotate-function)))
+    (let ((completion-annotate-function
+           (plist-get plist :annotation-function)))
       (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
                               (plist-get plist :predicate))))))
 
@@ -685,7 +685,7 @@ considered."
       (when end
         (list beg end obarray
               :predicate predicate
-              :annotate-function
+              :annotation-function
               (unless (eq predicate 'fboundp)
                 (lambda (str) (if (fboundp (intern-soft str)) " <f>"))))))))
 
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index ae18486c43b..4e4d7b15053 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -270,7 +270,7 @@ It calls them sequentially, and if any returns non-nil,
 (defun which-function ()
   "Return current function name based on point.
 Uses `which-func-functions', `imenu--index-alist'
-or `add-log-current-defun-function'.
+or `add-log-current-defun'.
 If no function name is found, return nil."
   (let ((name
          ;; Try the `which-func-functions' functions first.
@@ -320,9 +320,8 @@ If no function name is found, return nil."
                               (reverse (cons (car pair) namestack))))))))))))
 
     ;; Try using add-log support.
-    (when (and (null name) (boundp 'add-log-current-defun-function)
-               add-log-current-defun-function)
-      (setq name (funcall add-log-current-defun-function)))
+    (when (null name)
+      (setq name (add-log-current-defun)))
     ;; Filter the name if requested.
     (when name
       (if which-func-cleanup-function
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 75e3b514531..f26ccdbedda 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -566,7 +566,7 @@ major modes.  Uses `smerge-resolve-function' to do the actual work."
               (with-current-buffer buf
                 (zerop (call-process-region
                         (point-min) (point-max) "patch" t nil nil
-                        "-r" "/dev/null" "--no-backup-if-mismatch"
+                        "-r" null-device "--no-backup-if-mismatch"
                         "-fl" o))))
             (save-restriction
               (narrow-to-region m0b m0e)
@@ -582,7 +582,7 @@ major modes.  Uses `smerge-resolve-function' to do the actual work."
               (with-current-buffer buf
                 (zerop (call-process-region
                         (point-min) (point-max) "patch" t nil nil
-                        "-r" "/dev/null" "--no-backup-if-mismatch"
+                        "-r" null-device "--no-backup-if-mismatch"
                         "-fl" m))))
             (save-restriction
               (narrow-to-region m0b m0e)