(end-of-defun): Don't skip to next line after

[gnu-emacs] / lisp / vc-hooks.el

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 85f665bc9def28bc05bc689ba90ea5a5d33b7380..aacb0daa1a42afca60b8d5d350b7ea0305552ecd 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -1,7 +1,7 @@
 ;;; vc-hooks.el --- resident support for version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
@@ -177,8 +177,7 @@ individually should stay local."
       (delq nil (mapcar 'vc-stay-local-p file))
     (let* ((backend (vc-backend file))
           (sym (vc-make-backend-sym backend 'stay-local))
-          (stay-local (if (boundp sym) (symbol-value sym) t)))
-      (if (eq stay-local t) (setq stay-local vc-stay-local))
+          (stay-local (if (boundp sym) (symbol-value sym) vc-stay-local)))
       (if (symbolp stay-local) stay-local
        (let ((dirname (if (file-directory-p file)
                           (directory-file-name file)
@@ -420,7 +419,7 @@ If the file is not registered, or the master name is not known, return nil."
 If FILES are not registered, this function always returns nil.
 For registered files, the possible values are:
 
-  'implicit   FILES are always writeable, and checked out `implicitly'
+  'implicit   FILES are always writable, and checked out `implicitly'
               when the user saves the first changes to the file.
 
   'locking    FILES are read-only if up-to-date; user must type
@@ -853,7 +852,7 @@ current, and kill the buffer that visits the link."
   (let* ((true-buffer (find-buffer-visiting buffer-file-truename))
         (this-buffer (current-buffer)))
     (if (eq true-buffer this-buffer)
-       (progn
+       (let ((truename buffer-file-truename))
          (kill-buffer this-buffer)
          ;; In principle, we could do something like set-visited-file-name.
          ;; However, it can't be exactly the same as set-visited-file-name.