aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorGlenn Morris2012-02-28 00:17:21 -0800
committerGlenn Morris2012-02-28 00:17:21 -0800
commit44e97401cda5b464505ac798ae7f71dce0d2a06e (patch)
tree4d24550756a7e70b8bf593edd241ed0988d60c07 /lisp/vc
parenta34baa83cc0a770f9a5d845174281122dda91656 (diff)
downloademacs-44e97401cda5b464505ac798ae7f71dce0d2a06e.tar.gz
emacs-44e97401cda5b464505ac798ae7f71dce0d2a06e.zip
Standardize possessive apostrophe usage in manuals, docs, and comments
Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/diff-mode.el6
-rw-r--r--lisp/vc/ediff-util.el2
-rw-r--r--lisp/vc/vc-bzr.el4
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index ba4a2766526..16e33889c31 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1,6 +1,6 @@
1;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*- 1;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*-
2 2
3;; Copyright (C) 1998-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
4 4
5;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 5;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6;; Keywords: convenience patch diff vc 6;; Keywords: convenience patch diff vc
@@ -27,7 +27,7 @@
27;; to the corresponding source file. 27;; to the corresponding source file.
28 28
29;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>) 29;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>)
30;; Some efforts were spent to have it somewhat compatible with XEmacs' 30;; Some efforts were spent to have it somewhat compatible with XEmacs's
31;; diff-mode as well as with compilation-minor-mode 31;; diff-mode as well as with compilation-minor-mode
32 32
33;; Bugs: 33;; Bugs:
@@ -121,7 +121,7 @@ when editing big diffs)."
121 ("{" . diff-file-prev) 121 ("{" . diff-file-prev)
122 ("\C-m" . diff-goto-source) 122 ("\C-m" . diff-goto-source)
123 ([mouse-2] . diff-goto-source) 123 ([mouse-2] . diff-goto-source)
124 ;; From XEmacs' diff-mode. 124 ;; From XEmacs's diff-mode.
125 ("W" . widen) 125 ("W" . widen)
126 ;;("." . diff-goto-source) ;display-buffer 126 ;;("." . diff-goto-source) ;display-buffer
127 ;;("f" . diff-goto-source) ;find-file 127 ;;("f" . diff-goto-source) ;find-file
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 87740cdc75a..78a2163f653 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3103,7 +3103,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
3103;; according to context. 3103;; according to context.
3104;; If DEFAULT-FILE is set, it should be used as the default value. 3104;; If DEFAULT-FILE is set, it should be used as the default value.
3105;; If DEFAULT-DIR is non-nil, use it as the default directory. 3105;; If DEFAULT-DIR is non-nil, use it as the default directory.
3106;; Otherwise, use the value of Emacs' variable `default-directory.' 3106;; Otherwise, use the value of `default-directory.'
3107(defun ediff-read-file-name (prompt default-dir default-file &optional no-dirs) 3107(defun ediff-read-file-name (prompt default-dir default-file &optional no-dirs)
3108 ;; hack default-dir if it is not set 3108 ;; hack default-dir if it is not set
3109 (setq default-dir 3109 (setq default-dir
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 8c397144bf2..9f35fc8f035 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -1,6 +1,6 @@
1;;; vc-bzr.el --- VC backend for the bzr revision control system 1;;; vc-bzr.el --- VC backend for the bzr revision control system
2 2
3;; Copyright (C) 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
4 4
5;; Author: Dave Love <fx@gnu.org> 5;; Author: Dave Love <fx@gnu.org>
6;; Riccardo Murri <riccardo.murri@gmail.com> 6;; Riccardo Murri <riccardo.murri@gmail.com>
@@ -431,7 +431,7 @@ If any error occurred in running `bzr status', then return nil."
431 (skip-chars-forward " \n\t") ;Throw away spaces. 431 (skip-chars-forward " \n\t") ;Throw away spaces.
432 (cons status 432 (cons status
433 ;; "bzr" will output warnings and informational messages to 433 ;; "bzr" will output warnings and informational messages to
434 ;; stderr; due to Emacs' `vc-do-command' (and, it seems, 434 ;; stderr; due to Emacs's `vc-do-command' (and, it seems,
435 ;; `start-process' itself) limitations, we cannot catch stderr 435 ;; `start-process' itself) limitations, we cannot catch stderr
436 ;; and stdout into different buffers. So, if there's anything 436 ;; and stdout into different buffers. So, if there's anything
437 ;; left in the buffer after removing the above status 437 ;; left in the buffer after removing the above status