aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emulation
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/emulation
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/emulation')
-rw-r--r--lisp/emulation/cua-base.el6
-rw-r--r--lisp/emulation/tpu-edt.el6
-rw-r--r--lisp/emulation/viper-util.el6
-rw-r--r--lisp/emulation/viper.el4
4 files changed, 11 insertions, 11 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index a7cc40cea4b..9e7be0f670d 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,6 +1,6 @@
1;;; cua-base.el --- emulate CUA key bindings 1;;; cua-base.el --- emulate CUA key bindings
2 2
3;; Copyright (C) 1997-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
4 4
5;; Author: Kim F. Storm <storm@cua.dk> 5;; Author: Kim F. Storm <storm@cua.dk>
6;; Keywords: keyboard emulations convenience cua 6;; Keywords: keyboard emulations convenience cua
@@ -116,7 +116,7 @@
116 116
117;; CUA register support 117;; CUA register support
118;; -------------------- 118;; --------------------
119;; Emacs' standard register support is also based on a separate set of 119;; Emacs's standard register support is also based on a separate set of
120;; "register commands". 120;; "register commands".
121;; 121;;
122;; CUA's register support is activated by providing a numeric 122;; CUA's register support is activated by providing a numeric
@@ -134,7 +134,7 @@
134 134
135;; CUA rectangle support 135;; CUA rectangle support
136;; --------------------- 136;; ---------------------
137;; Emacs' normal rectangle support is based on interpreting the region 137;; Emacs's normal rectangle support is based on interpreting the region
138;; between the mark and point as a "virtual rectangle", and using a 138;; between the mark and point as a "virtual rectangle", and using a
139;; completely separate set of "rectangle commands" [C-x r ...] on the 139;; completely separate set of "rectangle commands" [C-x r ...] on the
140;; region to copy, kill, fill a.s.o. the virtual rectangle. 140;; region to copy, kill, fill a.s.o. the virtual rectangle.
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 305e3e73be0..eaf88ccdf85 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -1,6 +1,6 @@
1;;; tpu-edt.el --- Emacs emulating TPU emulating EDT 1;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
2 2
3;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc.
4 4
5;; Author: Rob Riepel <riepel@networking.stanford.edu> 5;; Author: Rob Riepel <riepel@networking.stanford.edu>
6;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> 6;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
@@ -89,7 +89,7 @@
89;; details. 89;; details.
90 90
91;; Like TPU, Emacs uses multiple buffers. Some buffers are used to hold 91;; Like TPU, Emacs uses multiple buffers. Some buffers are used to hold
92;; files you are editing; other "internal" buffers are used for Emacs' own 92;; files you are editing; other "internal" buffers are used for Emacs's own
93;; purposes (like showing you help). Here are some commands for dealing 93;; purposes (like showing you help). Here are some commands for dealing
94;; with buffers. 94;; with buffers.
95 95
@@ -197,7 +197,7 @@
197 197
198;; ; Emacs uses Control-s and Control-q. Problems can occur when using 198;; ; Emacs uses Control-s and Control-q. Problems can occur when using
199;; ; Emacs on terminals that use these codes for flow control (Xon/Xoff 199;; ; Emacs on terminals that use these codes for flow control (Xon/Xoff
200;; ; flow control). These lines disable Emacs' use of these characters. 200;; ; flow control). These lines disable Emacs's use of these characters.
201;; (global-unset-key "\C-s") 201;; (global-unset-key "\C-s")
202;; (global-unset-key "\C-q") 202;; (global-unset-key "\C-q")
203 203
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 7cba5441c23..cdeef733bc5 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,6 +1,6 @@
1;;; viper-util.el --- Utilities used by viper.el 1;;; viper-util.el --- Utilities used by viper.el
2 2
3;; Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
4 4
5;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 5;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
6;; Package: viper 6;; Package: viper
@@ -295,7 +295,7 @@ Otherwise return the normal value."
295 result)) 295 result))
296 296
297;; Emacs used to count each multibyte character as several positions in the buffer, 297;; Emacs used to count each multibyte character as several positions in the buffer,
298;; so we had to use Emacs' chars-in-region to count characters. Since 20.3, 298;; so we had to use Emacs's chars-in-region to count characters. Since 20.3,
299;; Emacs counts multibyte characters as 1 position. XEmacs has always been 299;; Emacs counts multibyte characters as 1 position. XEmacs has always been
300;; counting each char as just one pos. So, now we can simply subtract beg from 300;; counting each char as just one pos. So, now we can simply subtract beg from
301;; end to determine the number of characters in a region. 301;; end to determine the number of characters in a region.
@@ -1112,7 +1112,7 @@ Otherwise return the normal value."
1112 lis))) 1112 lis)))
1113 1113
1114 1114
1115;; Smooths out the difference between Emacs' unread-command-events 1115;; Smooths out the difference between Emacs's unread-command-events
1116;; and XEmacs unread-command-event. Arg is a character, an event, a list of 1116;; and XEmacs unread-command-event. Arg is a character, an event, a list of
1117;; events or a sequence of keys. 1117;; events or a sequence of keys.
1118;; 1118;;
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index d304a247bb8..12c186e234e 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -87,7 +87,7 @@
87;; facility in the original Vi. 87;; facility in the original Vi.
88;; First, one can execute any Emacs command while defining a 88;; First, one can execute any Emacs command while defining a
89;; macro, not just the Vi commands. Second, macros are defined in a 89;; macro, not just the Vi commands. Second, macros are defined in a
90;; WYSYWYG mode, using an interface to Emacs' WYSIWYG style of defining 90;; WYSYWYG mode, using an interface to Emacs's WYSIWYG style of defining
91;; macros. Third, in Viper, one can define macros that are specific to 91;; macros. Third, in Viper, one can define macros that are specific to
92;; a given buffer, a given major mode, or macros defined for all buffers. 92;; a given buffer, a given major mode, or macros defined for all buffers.
93;; The same macro name can have several different definitions: 93;; The same macro name can have several different definitions:
@@ -561,7 +561,7 @@ and improving upon much of it.
561 use Emacs productively, you are advised to reach user level 3 or higher. 561 use Emacs productively, you are advised to reach user level 3 or higher.
562 562
563 At user level 2 or higher, ^X and ^C have Emacs, not Vi, bindings; 563 At user level 2 or higher, ^X and ^C have Emacs, not Vi, bindings;
564 ^Z toggles Vi/Emacs states; ^G is Emacs' keyboard-quit (like ^C in Vi). 564 ^Z toggles Vi/Emacs states; ^G is Emacs's keyboard-quit (like ^C in Vi).
565 565
566 2. Vi exit functions (e.g., :wq, ZZ) work on INDIVIDUAL files -- they 566 2. Vi exit functions (e.g., :wq, ZZ) work on INDIVIDUAL files -- they
567 do not cause Emacs to quit, except at user level 1 (for a novice). 567 do not cause Emacs to quit, except at user level 1 (for a novice).