[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107455: Standardize possessive apost
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107455: Standardize possessive apostrophe usage in manuals, docs, and comments |
|
Date: |
Tue, 28 Feb 2012 00:17:21 -0800 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107455
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-28 00:17:21 -0800
message:
Standardize possessive apostrophe usage in manuals, docs, and comments
Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
modified:
admin/notes/documentation
doc/emacs/ChangeLog
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/files.texi
doc/emacs/msdog-xtra.texi
doc/emacs/msdog.texi
doc/emacs/vc-xtra.texi
doc/lispintro/ChangeLog
doc/lispintro/emacs-lisp-intro.texi
doc/lispref/ChangeLog
doc/lispref/advice.texi
doc/lispref/anti.texi
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/lispref/processes.texi
doc/lispref/variables.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
doc/misc/ChangeLog
doc/misc/calc.texi
doc/misc/cc-mode.texi
doc/misc/cl.texi
doc/misc/ebrowse.texi
doc/misc/ediff.texi
doc/misc/eshell.texi
doc/misc/gnus-faq.texi
doc/misc/gnus-news.texi
doc/misc/gnus.texi
doc/misc/idlwave.texi
doc/misc/info.texi
doc/misc/newsticker.texi
doc/misc/nxml-mode.texi
doc/misc/org.texi
doc/misc/sc.texi
doc/misc/vip.texi
doc/misc/viper.texi
lisp/ChangeLog
lisp/bookmark.el
lisp/bs.el
lisp/calendar/timeclock.el
lisp/cedet/ChangeLog
lisp/cedet/semantic.el
lisp/cedet/semantic/db-el.el
lisp/cedet/semantic/db.el
lisp/emacs-lisp/authors.el
lisp/emacs-lisp/easymenu.el
lisp/emacs-lisp/ert.el
lisp/emacs-lisp/ewoc.el
lisp/emacs-lisp/regexp-opt.el
lisp/emulation/cua-base.el
lisp/emulation/tpu-edt.el
lisp/emulation/viper-util.el
lisp/emulation/viper.el
lisp/erc/erc-compat.el
lisp/eshell/em-unix.el
lisp/eshell/em-xtra.el
lisp/eshell/eshell.el
lisp/files.el
lisp/filesets.el
lisp/font-lock.el
lisp/gnus/gmm-utils.el
lisp/gnus/gnus-agent.el
lisp/gnus/gnus-score.el
lisp/gnus/mm-decode.el
lisp/help.el
lisp/htmlfontify.el
lisp/image.el
lisp/international/mule.el
lisp/mail/feedmail.el
lisp/mh-e/mh-compat.el
lisp/net/browse-url.el
lisp/net/eudc.el
lisp/net/secrets.el
lisp/play/gomoku.el
lisp/play/handwrite.el
lisp/play/landmark.el
lisp/progmodes/antlr-mode.el
lisp/progmodes/vhdl-mode.el
lisp/shell.el
lisp/textmodes/sgml-mode.el
lisp/vc/diff-mode.el
lisp/vc/ediff-util.el
lisp/vc/vc-bzr.el
lisp/w32-fns.el
=== modified file 'admin/notes/documentation'
--- a/admin/notes/documentation 2008-11-29 12:28:15 +0000
+++ b/admin/notes/documentation 2012-02-28 08:17:21 +0000
@@ -112,3 +112,6 @@
is where a feature works _differently_ in the previous version.
In those cases, the user might have trouble figuring out how to use
the old version without some sort of help.
+
+** To indicate possession, write Emacs's rather than Emacs'.
+http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-02-25 10:04:30 +0000
+++ b/doc/emacs/ChangeLog 2012-02-28 08:17:21 +0000
@@ -1,3 +1,9 @@
+2012-02-28 Glenn Morris <address@hidden>
+
+ * custom.texi, display.texi, emacs.texi, files.texi:
+ * msdog-xtra.texi, msdog.texi, vc-xtra.texi:
+ Standardize possessive apostrophe usage.
+
2012-02-25 Jan Dj??rv <address@hidden>
* macos.texi (Mac / GNUstep Customization): Remove text about
=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi 2012-01-19 07:21:25 +0000
+++ b/doc/emacs/custom.texi 2012-02-28 08:17:21 +0000
@@ -567,7 +567,7 @@
(which defaults to @file{~/.emacs.d/}), and a directory named
@file{etc/themes} in your Emacs installation (see the variable
@code{data-directory}). The latter contains several Custom themes
-which are distributed with Emacs, which customize Emacs' faces to fit
+which are distributed with Emacs, which customize Emacs's faces to fit
various color schemes. (Note, however, that Custom themes need not be
restricted to this purpose; they can be used to customize variables
too).
=== modified file 'doc/emacs/display.texi'
--- a/doc/emacs/display.texi 2012-02-20 23:50:52 +0000
+++ b/doc/emacs/display.texi 2012-02-28 08:17:21 +0000
@@ -22,7 +22,7 @@
* Follow Mode:: Follow mode lets two windows scroll as one.
* Faces:: How to change the display style using faces.
* Colors:: Specifying colors for faces.
-* Standard Faces:: Emacs' predefined faces.
+* Standard Faces:: The main predefined faces.
* Text Scale:: Increasing or decreasing text size in a buffer.
* Font Lock:: Minor mode for syntactic highlighting using faces.
* Highlight Interactively:: Tell Emacs what text to highlight.
=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi 2012-02-20 23:50:52 +0000
+++ b/doc/emacs/emacs.texi 2012-02-28 08:17:21 +0000
@@ -163,7 +163,7 @@
* International:: Using address@hidden character sets.
Advanced Features
-* Modes:: Major and minor modes alter Emacs' basic behavior.
+* Modes:: Major and minor modes alter Emacs's basic behavior.
* Indentation:: Editing the white space at the beginnings of lines.
* Text:: Commands and modes for editing human languages.
* Programs:: Commands and modes for editing programs.
@@ -337,7 +337,7 @@
* Follow Mode:: Follow mode lets two windows scroll as one.
* Faces:: How to change the display style using faces.
* Colors:: Specifying colors for faces.
-* Standard Faces:: Emacs' predefined faces.
+* Standard Faces:: The main predefined faces.
* Text Scale:: Increasing or decreasing text size in a buffer.
* Font Lock:: Minor mode for syntactic highlighting using faces.
* Highlight Interactively:: Tell Emacs what text to highlight.
=== modified file 'doc/emacs/files.texi'
--- a/doc/emacs/files.texi 2012-02-20 23:50:52 +0000
+++ b/doc/emacs/files.texi 2012-02-28 08:17:21 +0000
@@ -288,7 +288,7 @@
Each time you visit a file, Emacs automatically scans its contents
to detect what character encoding and end-of-line convention it uses,
-and converts these to Emacs' internal encoding and end-of-line
+and converts these to Emacs's internal encoding and end-of-line
convention within the buffer. When you save the buffer, Emacs
performs the inverse conversion, writing the file to disk with its
original encoding and end-of-line convention. @xref{Coding Systems}.
=== modified file 'doc/emacs/msdog-xtra.texi'
--- a/doc/emacs/msdog-xtra.texi 2012-02-23 04:32:18 +0000
+++ b/doc/emacs/msdog-xtra.texi 2012-02-28 08:17:21 +0000
@@ -33,7 +33,7 @@
@ifnottex
@xref{Text and Binary}, for information
@end ifnottex
-about Emacs' special handling of text files under MS-DOS (and Windows).
+about Emacs's special handling of text files under MS-DOS (and Windows).
@menu
* Keyboard: MS-DOS Keyboard. Keyboard conventions on MS-DOS.
=== modified file 'doc/emacs/msdog.texi'
--- a/doc/emacs/msdog.texi 2012-02-23 05:36:08 +0000
+++ b/doc/emacs/msdog.texi 2012-02-28 08:17:21 +0000
@@ -574,7 +574,7 @@
Windows menu, it alters the meaning of subsequent commands. Many
users find this frustrating.
- You can re-enable Windows' default handling of tapping the @key{ALT}
+ You can re-enable Windows's default handling of tapping the @key{ALT}
key by setting @code{w32-pass-alt-to-system} to a address@hidden
value.
=== modified file 'doc/emacs/vc-xtra.texi'
--- a/doc/emacs/vc-xtra.texi 2012-01-19 07:21:25 +0000
+++ b/doc/emacs/vc-xtra.texi 2012-02-28 08:17:21 +0000
@@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
address@hidden Copyright (C) 2004-2012 Free Software Foundation, Inc.
address@hidden Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included in emacs-xtra.texi when producing the printed
@@ -8,7 +8,7 @@
@node Advanced VC Usage
@section Advanced VC Usage
- Commonly used features of Emacs' version control (VC) support are
+ Commonly used features of Emacs's version control (VC) support are
described in the main Emacs manual (@pxref{Version Control,,,emacs,
the Emacs Manual}). This chapter describes more advanced VC usage.
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2012-02-17 07:44:31 +0000
+++ b/doc/lispintro/ChangeLog 2012-02-28 08:17:21 +0000
@@ -1,3 +1,7 @@
+2012-02-28 Glenn Morris <address@hidden>
+
+ * emacs-lisp-intro.texi: Standardize possessive apostrophe usage.
+
2012-02-17 Glenn Morris <address@hidden>
* emacs-lisp-intro.texi (Design @value{COUNT-WORDS}, Syntax)
=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi 2012-02-17 07:44:31 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi 2012-02-28 08:17:21 +0000
@@ -1015,7 +1015,7 @@
means you press and release the @key{CTRL} key and the @kbd{h} at the
same time, and then press and release @kbd{t}.)
-Also, I often refer to one of Emacs' standard commands by listing the
+Also, I often refer to one of Emacs's standard commands by listing the
keys which you press to invoke the command and then giving the name of
the command in parentheses, like this: @kbd{M-C-\}
(@code{indent-region}). What this means is that the
@@ -1325,7 +1325,7 @@
see which one it is. This is very useful, since every list you type
in Lisp must have its closing parenthesis match its opening
parenthesis. (@xref{Major Modes, , Major Modes, emacs, The GNU Emacs
-Manual}, for more information about Emacs' modes.)
+Manual}, for more information about Emacs's modes.)
@node Run a Program, Making Errors, Lisp Lists, List Processing
@comment node-name, next, previous, up
@@ -2962,7 +2962,7 @@
not need to be visible on the screen.
@code{switch-to-buffer} is designed for humans and does two different
-things: it switches the buffer to which Emacs' attention is directed; and
+things: it switches the buffer to which Emacs's attention is directed; and
it switches the buffer displayed in the window to the new buffer.
@code{set-buffer}, on the other hand, does only one thing: it switches
the attention of the computer program to a different buffer. The buffer
@@ -4642,7 +4642,7 @@
window so users can look at it. Usually bound to @kbd{C-x b}.
@item set-buffer
-Switch Emacs' attention to a buffer on which programs will run. Don't
+Switch Emacs's attention to a buffer on which programs will run. Don't
alter what the window is showing.
@item buffer-size
@@ -5501,7 +5501,7 @@
In summary, @code{append-to-buffer} works as follows: it saves the
value of the current buffer in the variable called @code{oldbuf}. It
-gets the new buffer (creating one if need be) and switches Emacs'
+gets the new buffer (creating one if need be) and switches Emacs's
attention to it. Using the value of @code{oldbuf}, it inserts the
region of text from the old buffer into the new buffer; and then using
@code{save-excursion}, it brings you back to your original buffer.
@@ -6009,7 +6009,7 @@
@end smallexample
@noindent
-The expression @code{(set-buffer buffer)} changes Emacs' attention
+The expression @code{(set-buffer buffer)} changes Emacs's attention
from the current buffer to the one from which the text will copied.
In that buffer, the variables @code{start} and @code{end} are set to
the beginning and end of the buffer, using the commands
@@ -15284,7 +15284,7 @@
don't see anything going on, the first line of the body is a
message.
-The next line contains a @code{save-excursion} that returns Emacs'
+The next line contains a @code{save-excursion} that returns Emacs's
attention to the current buffer when the function completes. This is
useful in case you embed this function in another function that
presumes point is restored to the original buffer.
@@ -16954,7 +16954,7 @@
@section Need for Printed Axes
A graph needs printed axes, so you can orient yourself. For a do-once
-project, it may be reasonable to draw the axes by hand using Emacs'
+project, it may be reasonable to draw the axes by hand using Emacs's
Picture mode; but a graph drawing function may be used more than once.
For this reason, I have written enhancements to the basic
@@ -17002,10 +17002,10 @@
@node Default Configuration, Site-wide Init, Emacs Initialization, Emacs
Initialization
@ifnottex
address@hidden Emacs' Default Configuration
address@hidden Emacs's Default Configuration
@end ifnottex
-There are those who appreciate Emacs' default configuration. After
+There are those who appreciate Emacs's default configuration. After
all, Emacs starts you in C mode when you edit a C file, starts you in
Fortran mode when you edit a Fortran file, and starts you in
Fundamental mode when you edit an unadorned file. This all makes
@@ -17033,7 +17033,7 @@
naming conventions; the old format saves typing.}
A @file{~/.emacs} file contains Emacs Lisp code. You can write this
-code yourself; or you can use Emacs' @code{customize} feature to write
+code yourself; or you can use Emacs's @code{customize} feature to write
the code for you. You can combine your own expressions and
auto-written Customize expressions in your @file{.emacs} file.
@@ -17098,7 +17098,7 @@
@findex defcustom
You can specify variables using @code{defcustom} so that you and
-others can then use Emacs' @code{customize} feature to set their
+others can then use Emacs's @code{customize} feature to set their
values. (You cannot use @code{customize} to write function
definitions; but you can write @code{defuns} in your @file{.emacs}
file. Indeed, you can write any Lisp expression in your @file{.emacs}
@@ -17765,7 +17765,7 @@
@vindex load-path
If you load many extensions, as I do, then instead of specifying the
exact location of the extension file, as shown above, you can specify
-that directory as part of Emacs' @code{load-path}. Then, when Emacs
+that directory as part of Emacs's @code{load-path}. Then, when Emacs
loads a file, it will search that directory as well as its default
list of directories. (The default list is specified in @file{paths.h}
when Emacs is built.)
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2012-02-28 07:30:20 +0000
+++ b/doc/lispref/ChangeLog 2012-02-28 08:17:21 +0000
@@ -1,5 +1,9 @@
2012-02-28 Glenn Morris <address@hidden>
+ * advice.texi, anti.texi, display.texi, elisp.texi:
+ * processes.texi, variables.texi, vol1.texi, vol2.texi:
+ Standardize possessive apostrophe usage.
+
* locals.texi: Remove file.
* elisp.texi, vol1.texi, vol2.texi: Don't include locals.texi.
Remove menu entry.
=== modified file 'doc/lispref/advice.texi'
--- a/doc/lispref/advice.texi 2012-02-10 15:50:11 +0000
+++ b/doc/lispref/advice.texi 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
address@hidden Copyright (C) 1998-1999, 2001-2012 Free Software Foundation,
Inc.
address@hidden Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/advising
@node Advising Functions, Debugging, Byte Compilation, Top
@@ -31,7 +31,7 @@
been modified with advice. Therefore, if you have the possibility to
change the code of that function to run a hook, please solve the
problem that way. Advice should be reserved for the cases where you
-cannot get the function changed. In particular, Emacs' own source
+cannot get the function changed. In particular, Emacs's own source
files should not put advice on functions in Emacs. There are
currently a few exceptions to this convention, but we aim to correct
them.
=== modified file 'doc/lispref/anti.texi'
--- a/doc/lispref/anti.texi 2012-01-19 07:21:25 +0000
+++ b/doc/lispref/anti.texi 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
address@hidden Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
address@hidden Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@c This node must have no pointers.
@@ -29,7 +29,7 @@
The @code{^} interactive spec code, the function
@code{handle-shift-selection}, and the variable
@code{this-command-keys-shift-translated} have all been removed.
-Shift-translated keys are no longer treated specially, making Emacs'
+Shift-translated keys are no longer treated specially, making Emacs's
handling of keybindings much more consistent.
@item
=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi 2012-02-11 14:56:54 +0000
+++ b/doc/lispref/display.texi 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
address@hidden Copyright (C) 1990-1995, 1998-2012 Free Software Foundation,
Inc.
address@hidden Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/display
@node Display, System Interface, Processes, Top
@@ -28,7 +28,7 @@
* Display Property:: Enabling special display features.
* Images:: Displaying images in Emacs buffers.
* Buttons:: Adding clickable buttons to Emacs buffers.
-* Abstract Display:: Emacs' Widget for Object Collections.
+* Abstract Display:: Emacs's Widget for Object Collections.
* Blinking:: How Emacs shows the matching open parenthesis.
* Usual Display:: The usual conventions for displaying nonprinting chars.
* Display Tables:: How to specify other conventions.
@@ -4941,7 +4941,7 @@
selected frame. If @var{frame} is @code{t}, the image is flushed on
all existing frames.
-In Emacs' current implementation, each graphical terminal possesses an
+In Emacs's current implementation, each graphical terminal possesses an
image cache, which is shared by all the frames on that terminal
(@pxref{Multiple Terminals}). Thus, refreshing an image in one frame
also refreshes it in all other frames on the same terminal.
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2012-02-28 04:17:02 +0000
+++ b/doc/lispref/elisp.texi 2012-02-28 08:17:21 +0000
@@ -1263,7 +1263,7 @@
* Display Property:: Enabling special display features.
* Images:: Displaying images in Emacs buffers.
* Buttons:: Adding clickable buttons to Emacs buffers.
-* Abstract Display:: Emacs' Widget for Object Collections.
+* Abstract Display:: Emacs's Widget for Object Collections.
* Blinking:: How Emacs shows the matching open parenthesis.
* Usual Display:: The usual conventions for displaying
nonprinting chars.
=== modified file 'doc/lispref/processes.texi'
--- a/doc/lispref/processes.texi 2012-02-18 13:38:33 +0000
+++ b/doc/lispref/processes.texi 2012-02-28 08:17:21 +0000
@@ -2712,7 +2712,7 @@
@itemx dword
@itemx long
Unsigned integer in network byte order, with length 4.
-Note: These values may be limited by Emacs' integer implementation limits.
+Note: These values may be limited by Emacs's integer implementation limits.
@item u16r
@itemx u24r
=== modified file 'doc/lispref/variables.texi'
--- a/doc/lispref/variables.texi 2012-02-15 05:15:43 +0000
+++ b/doc/lispref/variables.texi 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
address@hidden Copyright (C) 1990-1995, 1998-2012 Free Software Foundation,
Inc.
address@hidden Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/variables
@node Variables, Functions, Control Structures, Top
@@ -479,7 +479,7 @@
buffer-local bindings for a symbol that is defined with
@code{defconst}.)
-An example of the use of @code{defconst} is Emacs' definition of
+An example of the use of @code{defconst} is Emacs's definition of
@code{float-pi}---the mathematical constant @math{pi}, which ought not
to be changed by anyone (attempts by the Indiana State Legislature
notwithstanding). As the second form illustrates, however,
=== modified file 'doc/lispref/vol1.texi'
--- a/doc/lispref/vol1.texi 2012-02-28 04:17:02 +0000
+++ b/doc/lispref/vol1.texi 2012-02-28 08:17:21 +0000
@@ -1285,7 +1285,7 @@
* Display Property:: Enabling special display features.
* Images:: Displaying images in Emacs buffers.
* Buttons:: Adding clickable buttons to Emacs buffers.
-* Abstract Display:: Emacs' Widget for Object Collections.
+* Abstract Display:: Emacs's Widget for Object Collections.
* Blinking:: How Emacs shows the matching open parenthesis.
* Usual Display:: The usual conventions for displaying
nonprinting chars.
=== modified file 'doc/lispref/vol2.texi'
--- a/doc/lispref/vol2.texi 2012-02-28 04:17:02 +0000
+++ b/doc/lispref/vol2.texi 2012-02-28 08:17:21 +0000
@@ -1284,7 +1284,7 @@
* Display Property:: Enabling special display features.
* Images:: Displaying images in Emacs buffers.
* Buttons:: Adding clickable buttons to Emacs buffers.
-* Abstract Display:: Emacs' Widget for Object Collections.
+* Abstract Display:: Emacs's Widget for Object Collections.
* Blinking:: How Emacs shows the matching open parenthesis.
* Usual Display:: The usual conventions for displaying
nonprinting chars.
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2012-02-26 09:29:50 +0000
+++ b/doc/misc/ChangeLog 2012-02-28 08:17:21 +0000
@@ -1,3 +1,11 @@
+2012-02-28 Glenn Morris <address@hidden>
+
+ * calc.texi, cc-mode.texi, cl.texi, ebrowse.texi, ediff.texi:
+ * eshell.texi, gnus-faq.texi, gnus-news.texi, gnus.texi:
+ * idlwave.texi, info.texi, newsticker.texi, nxml-mode.texi:
+ * org.texi, sc.texi, vip.texi, viper.texi:
+ Standardize possessive apostrophe usage.
+
2012-02-26 Chong Yidong <address@hidden>
* ediff.texi (Quick Help Commands): Add a couple of index entries
=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/calc.texi 2012-02-28 08:17:21 +0000
@@ -9819,7 +9819,7 @@
@kindex Z ?
@pindex calc-help
The @kbd{?} key (@code{calc-help}) displays a series of brief help messages.
-Some keys (such as @kbd{b} and @kbd{d}) are prefix keys, like Emacs'
+Some keys (such as @kbd{b} and @kbd{d}) are prefix keys, like Emacs's
@key{ESC} and @kbd{C-x} prefixes. You can type
@kbd{?} after a prefix to see a list of commands beginning with that
prefix. (If the message includes @samp{[MORE]}, press @kbd{?} again
@@ -18912,7 +18912,7 @@
of the theory of random number generators and their measurement and
characterization.
-If @code{RandSeed} has no stored value, Calc calls Emacs' built-in
+If @code{RandSeed} has no stored value, Calc calls Emacs's built-in
@code{random} function to get a stream of random numbers, which it
then treats in various ways to avoid problems inherent in the simple
random number generators that many systems use to implement @code{random}.
@@ -35252,7 +35252,7 @@
Calc is controlled by many variables, most of which can be reset
from within Calc. Some variables are less involved with actual
-calculation and can be set outside of Calc using Emacs's
+calculation and can be set outside of Calc using Emacs'ss
customization facilities. These variables are listed below.
Typing @kbd{M-x customize-variable RET @var{variable-name} RET}
will bring up a buffer in which the variable's value can be redefined.
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2012-01-28 19:16:02 +0000
+++ b/doc/misc/cc-mode.texi 2012-02-28 08:17:21 +0000
@@ -156,7 +156,7 @@
@copying
This manual is for CC Mode in Emacs.
-Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -6942,7 +6942,7 @@
styles where these braces are hung (e.g. most JDK-derived Java styles),
this hack can improve performance of the core syntax parsing routines
from 3 to 60 times. However, for styles which @emph{do} conform to
-Emacs' recommended style of putting top-level braces in column zero,
+Emacs's recommended style of putting top-level braces in column zero,
this hack can degrade performance by about as much. Thus this variable
is set to @code{nil} by default, since the Emacs-friendly styles should
be more common (and encouraged!). Note that this variable has no effect
@@ -7053,7 +7053,7 @@
@kindex C-j
@emph{Why doesn't the @kbd{RET} key indent the new line?}
-Emacs' convention is that @kbd{RET} just adds a newline, and that
+Emacs's convention is that @kbd{RET} just adds a newline, and that
@kbd{C-j} adds a newline and indents it. You can make @kbd{RET} do this
too by adding this to your @code{c-initialization-hook}:
=== modified file 'doc/misc/cl.texi'
--- a/doc/misc/cl.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/cl.texi 2012-02-28 08:17:21 +0000
@@ -5,7 +5,7 @@
@copying
This file documents the GNU Emacs Common Lisp emulation package.
-Copyright @copyright{} 1993, 2001-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1993, 2001-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -128,7 +128,7 @@
@item
Some features conflict with existing things in Emacs Lisp. For
-example, Emacs' @code{assoc} function is incompatible with the
+example, Emacs's @code{assoc} function is incompatible with the
Common Lisp @code{assoc}. In such cases, this package usually
adds the suffix @samp{*} to the function name of the Common
Lisp version of the function (e.g., @code{assoc*}).
@@ -2094,7 +2094,7 @@
are executed with @var{var} bound to each element of the list in
turn. Finally, the @var{result} form (or @code{nil}) is evaluated
with @var{var} bound to @code{nil} to produce the result returned by
-the loop. Unlike with Emacs's built in @code{dolist}, the loop is
+the loop. Unlike with Emacs'ss built in @code{dolist}, the loop is
surrounded by an implicit @code{nil} block.
@end defspec
@@ -2104,7 +2104,7 @@
from zero (inclusive) to @var{count} (exclusive), in turn. Then
the @code{result} form is evaluated with @var{var} bound to the total
number of iterations that were done (i.e., @code{(max 0 @var{count})})
-to get the return value for the loop form. Unlike with Emacs's built in
+to get the return value for the loop form. Unlike with Emacs'ss built in
@code{dolist}, the loop is surrounded by an implicit @code{nil} block.
@end defspec
@@ -2226,7 +2226,7 @@
it calls @code{buffer-file-name} and collects the results into
a list, which is then returned from the @code{loop} construct.
The result is a list of the file names of all the buffers in
-Emacs' memory. The words @code{for}, @code{in}, and @code{collect}
+Emacs's memory. The words @code{for}, @code{in}, and @code{collect}
are reserved words in the @code{loop} language.
@example
@@ -3870,7 +3870,7 @@
As an extension to Common Lisp, @var{start} and/or @var{end}
may be negative, in which case they represent a distance back
from the end of the sequence. This is for compatibility with
-Emacs' @code{substring} function. Note that @code{subseq} is
+Emacs's @code{substring} function. Note that @code{subseq} is
the @emph{only} sequence function that allows negative
@var{start} and @var{end}.
@@ -4059,7 +4059,7 @@
for sorting numbers and strings, respectively; @code{>} would sort
numbers into decreasing rather than increasing order.
-This function differs from Emacs' built-in @code{sort} in that it
+This function differs from Emacs's built-in @code{sort} in that it
can operate on any type of sequence, not just lists. Also, it
accepts a @code{:key} argument which is used to preprocess data
fed to the @var{predicate} function. For example,
@@ -5186,7 +5186,7 @@
@xref{Lexical Bindings}, for a description of the @code{lexical-let}
form which establishes a Common Lisp-style lexical binding, and some
-examples of how it differs from Emacs' regular @code{let}.
+examples of how it differs from Emacs's regular @code{let}.
@item
Reader macros. Common Lisp includes a second type of macro that
=== modified file 'doc/misc/ebrowse.texi'
--- a/doc/misc/ebrowse.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/ebrowse.texi 2012-02-28 08:17:21 +0000
@@ -10,7 +10,7 @@
@copying
This file documents Ebrowse, a C++ class browser for GNU Emacs.
-Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -149,7 +149,7 @@
with a keystroke. @xref{Member Buffers}.
These two buffer types and the commands they provide support the
-navigational use of the browser. The second form resembles Emacs' Tags
+navigational use of the browser. The second form resembles Emacs's Tags
package for C and other procedural languages. Ebrowse's commands of
this type are not confined to special buffers; they are most often used
while you are editing your source code.
=== modified file 'doc/misc/ediff.texi'
--- a/doc/misc/ediff.texi 2012-02-26 09:29:50 +0000
+++ b/doc/misc/ediff.texi 2012-02-28 08:17:21 +0000
@@ -1733,7 +1733,7 @@
@end smallexample
@strong{Please note:} to set Ediff's faces, use only @code{copy-face}
-or @code{set/address@hidden as shown above. Emacs' low-level
+or @code{set/address@hidden as shown above. Emacs's low-level
face-manipulation functions should be avoided.
@node Narrowing, Refinement of Difference Regions, Highlighting Difference
Regions, Customization
=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/eshell.texi 2012-02-28 08:17:21 +0000
@@ -94,7 +94,7 @@
@cindex Eshell, what it is
Eshell is a @dfn{command shell} written in Emacs Lisp. Everything it
-does, it uses Emacs' facilities to do. This means that Eshell is as
+does, it uses Emacs's facilities to do. This means that Eshell is as
portable as Emacs itself. It also means that cooperation with Lisp code
is natural and seamless.
=== modified file 'doc/misc/gnus-faq.texi'
--- a/doc/misc/gnus-faq.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/gnus-faq.texi 2012-02-28 08:17:21 +0000
@@ -161,7 +161,7 @@
@subsubheading Answer
Gnus is released independent from releases of Emacs and XEmacs.
-Therefore, the version bundled with Emacs or the version in XEmacs'
+Therefore, the version bundled with Emacs or the version in XEmacs's
package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs
21 is outdated).
You can get the latest released version of Gnus from
=== modified file 'doc/misc/gnus-news.texi'
--- a/doc/misc/gnus-news.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/gnus-news.texi 2012-02-28 08:17:21 +0000
@@ -44,7 +44,7 @@
safe in general.
@item Incompatibility when switching from Emacs 23 to Emacs 22
-In Emacs 23, Gnus uses Emacs' new internal coding system @code{utf-8-emacs}
+In Emacs 23, Gnus uses Emacs's new internal coding system @code{utf-8-emacs}
for saving articles drafts and @file{~/.newsrc.eld}. These files may not
be read correctly in Emacs 22 and below. If you want to use Gnus across
different Emacs versions, you may set @code{mm-auto-save-coding-system}
@@ -333,7 +333,7 @@
Its default value depends on your Emacs version.
@c FIXME: Document this in the manual
address@hidden You can change the location of XEmacs' toolbars in Gnus buffers.
address@hidden You can change the location of XEmacs's toolbars in Gnus buffers.
See @code{gnus-use-toolbar} and @code{message-use-toolbar}.
@end itemize
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2012-02-17 07:44:31 +0000
+++ b/doc/misc/gnus.texi 2012-02-28 08:17:21 +0000
@@ -16696,7 +16696,7 @@
format to which mail was converted, primarily involving creating a
spool-file-like entity with a scheme for inserting Babyl-specific
headers and status bits above the top of each message in the file.
-Rmail was Emacs' first mail reader, it was written by Richard Stallman,
+Rmail was Emacs's first mail reader, it was written by Richard Stallman,
and Stallman came out of that TOPS/Babyl environment, so he wrote Rmail
to understand the mail files folks already had in existence. Gnus (and
VM, for that matter) continue to support this format because it's
@@ -21040,7 +21040,7 @@
(* (abs score)
gnus-score-decay-scale)))))))
(if (and (featurep 'xemacs)
- ;; XEmacs' floor can handle only the floating point
+ ;; XEmacs's floor can handle only the floating point
;; number below the half of the maximum integer.
(> (abs n) (lsh -1 -2)))
(string-to-number
=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/idlwave.texi 2012-02-28 08:17:21 +0000
@@ -4193,7 +4193,7 @@
(e.g. v4.7 for Emacs 21.x), which is likely what's being used instead.
You need to make sure your Emacs @emph{load-path} contains the directory
where IDLWAVE is installed (@file{/usr/local/share/emacs/site-lisp}, by
-default), @emph{before} Emacs' default search directories. You can
+default), @emph{before} Emacs's default search directories. You can
accomplish this by putting the following in your @file{.emacs}:
@lisp
=== modified file 'doc/misc/info.texi'
--- a/doc/misc/info.texi 2012-02-09 07:33:11 +0000
+++ b/doc/misc/info.texi 2012-02-28 08:17:21 +0000
@@ -14,8 +14,7 @@
This file describes how to use Info, the on-line, menu-driven GNU
documentation system.
-Copyright @copyright{} 1989, 1992, 1996-2012
-Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -1108,7 +1107,7 @@
this is so you need not count how many entries are there.
If your display supports multiple fonts, colors or underlining, and
-you are using Emacs' Info mode to read Info files, the third, sixth
+you are using Emacs's Info mode to read Info files, the third, sixth
and ninth menu items have a @samp{*} that stands out, either in color
or in some other attribute, such as underline; this makes it easy to
see at a glance which number to use for an item.
=== modified file 'doc/misc/newsticker.texi'
--- a/doc/misc/newsticker.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/newsticker.texi 2012-02-28 08:17:21 +0000
@@ -13,8 +13,7 @@
This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}).
@noindent
-Copyright @copyright{} 2004-2012
-Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -128,7 +127,7 @@
you are using XEmacs you want to get the @file{net-utils} package
which contains @file{xml.el} for XEmacs.
-Newsticker retrieves headlines either via Emacs' built-in retrieval
+Newsticker retrieves headlines either via Emacs's built-in retrieval
functions, by an arbitrary external program that retrieves files via
http and prints them to stdout (like
@uref{http://www.gnu.org/software/wget/wget.html, wget}, or -- on a
@@ -215,7 +214,7 @@
@item
@vindex newsticker-retrieval-method
@code{newsticker-retrieval-method} defines how headlines are
-retrieved. This is either done using Emacs' built-in download
+retrieved. This is either done using Emacs's built-in download
capabilities or using an external tool.
@item
@vindex newsticker-retrieval-interval
=== modified file 'doc/misc/nxml-mode.texi'
--- a/doc/misc/nxml-mode.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/nxml-mode.texi 2012-02-28 08:17:21 +0000
@@ -8,8 +8,7 @@
This manual documents nxml-mode, an Emacs major mode for editing
XML with RELAX NG support.
-Copyright @copyright{} 2007-2012
-Free Software Foundation, Inc.
+Copyright @copyright{} 2007-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -355,7 +354,7 @@
@chapter Outlining
nXML mode allows you to display all or part of a buffer as an
-outline, in a similar way to Emacs' outline mode. An outline in nXML
+outline, in a similar way to Emacs's outline mode. An outline in nXML
mode is based on recognizing two kinds of element: sections and
headings. There is one heading for every section and one section for
every heading. A section contains its heading as or within its first
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/org.texi 2012-02-28 08:17:21 +0000
@@ -265,7 +265,7 @@
@copying
This manual is for Org version @value{VERSION}.
-Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -6162,7 +6162,7 @@
By customizing the variable @code{org-clock-idle-time} to some integer, such
as 10 or 15, Emacs can alert you when you get back to your computer after
being idle for that many address@hidden computers using Mac OS X,
-idleness is based on actual user idleness, not just Emacs' idle time. For
+idleness is based on actual user idleness, not just Emacs's idle time. For
X11, you can install a utility program @file{x11idle.c}, available in the
UTILITIES directory of the Org git distribution, to get the same general
treatment of idleness. On other systems, idle time refers to Emacs idle time
=== modified file 'doc/misc/sc.texi'
--- a/doc/misc/sc.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/sc.texi 2012-02-28 08:17:21 +0000
@@ -204,7 +204,7 @@
(optionally) be filled by Supercite. However, if you manually edit the
cited text and want to re-fill it, you must use an add-on package such
as @cite{filladapt} or @cite{gin-mode}. These packages can recognize
-Supercited text and will fill them appropriately. Emacs' built-in
+Supercited text and will fill them appropriately. Emacs's built-in
filling routines, address@hidden @code{fill-paragraph}, do not recognize cited
text and will not re-fill them properly because it cannot guess the
@code{fill-prefix} being used.
@@ -786,7 +786,7 @@
One final note. After Supercite is loaded into your Emacs session, it
runs the hook @code{sc-load-hook}. You can put any customizations into
this hook since it is only run once. This will not work, however, if
-your Emacs maintainer has put Supercite into your dumped Emacs' image.
+your Emacs maintainer has put Supercite into your dumped Emacs image.
In that case, you can use the @code{sc-pre-hook} variable, but this will
get executed every time @code{sc-cite-original} is called. @xref{Reply
Buffer address@hidden
@@ -1008,7 +1008,7 @@
I usually run with both these variables containing their default values.
When Supercite's automatic filling breaks on a particular message, I
-will use Emacs' undo feature to undo back before the citation was
+will use Emacs's undo feature to undo back before the citation was
applied to the original message. Then I'll toggle the variables and
manually cite those paragraphs that I don't want to fill or collapse
whitespace on. @xref{Variable Toggling address@hidden
@@ -1688,7 +1688,7 @@
@findex set-variable
The following commands let you set the value of multi-value variables,
-in the same way that Emacs' @code{set-variable} does:
+in the same way that Emacs's @code{set-variable} does:
@table @kbd
@item C-c C-p C-t a
@@ -1777,7 +1777,7 @@
@findex open-line
@kindex C-c C-p o
@item @code{sc-open-line} (@kbd{C-c C-p o})
-Similar to Emacs' standard @code{open-line} commands, but inserts the
+Similar to Emacs's standard @code{open-line} commands, but inserts the
citation string in front of the new line. As with @code{open-line},
an optional numeric argument inserts that many new address@hidden
@end table
=== modified file 'doc/misc/vip.texi'
--- a/doc/misc/vip.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/vip.texi 2012-02-28 08:17:21 +0000
@@ -1705,7 +1705,7 @@
@var{pat} you must preceded it by @samp{\}. VIP strips off these @kbd{\}'s
before @kbd{/} and the resulting @var{pat} becomes the actual search
pattern. Emacs provides a different and richer class or regular
-expressions than Vi/Ex, and VIP uses Emacs' regular expressions. See GNU
+expressions than Vi/Ex, and VIP uses Emacs's regular expressions. See GNU
Emacs Manual for details of regular expressions.
Several Ex commands can be entered in a line by separating them by a pipe
=== modified file 'doc/misc/viper.texi'
--- a/doc/misc/viper.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/viper.texi 2012-02-28 08:17:21 +0000
@@ -687,7 +687,7 @@
which is similar to Vi's @kbd{p}. However, unlike @kbd{p}, @kbd{C-y} can be
used in Insert state of Viper. Emacs also has a kill ring where it keeps
pieces of text you deleted while editing buffers. The command @kbd{M-y} is
-used to delete the text previously put back by Emacs' @kbd{C-y} or by Vi's
+used to delete the text previously put back by Emacs's @kbd{C-y} or by Vi's
@kbd{p} command and reinsert text that was placed on the kill-ring earlier.
This works both in Vi and Insert states.
@@ -1289,7 +1289,7 @@
The above discussion of the meaning of Viper's words concerns only Viper's
movement commands. In regular expressions, words remain the same as in
Emacs. That is, the expressions @code{\w}, @code{\>}, @code{\<}, etc., use
-Emacs' idea of what is a word, and they don't look into the value of
+Emacs's idea of what is a word, and they don't look into the value of
variable @code{viper-syntax-preference}. This is because Viper doesn't change
syntax tables in fear of upsetting the various major modes that set these
tables.
@@ -2504,7 +2504,7 @@
@item viper-minibuffer-emacs-face 'viper-minibuffer-emacs-face
These faces control the appearance of the minibuffer text in the
corresponding Viper states. You can change the appearance of these faces
-through Emacs' customization widget, which is accessible through the
+through Emacs's customization widget, which is accessible through the
menubar.
Viper is located in this widget under the @emph{Emulations} customization
@@ -3205,7 +3205,7 @@
The above discussion concerns only the movement commands. In regular
expressions, words remain the same as in Emacs. That is, the expressions
address@hidden, @code{\>}, @code{\<}, etc., use Emacs' idea of what is a word,
address@hidden, @code{\>}, @code{\<}, etc., use Emacs's idea of what is a word,
and they don't look into the value of variable
@code{viper-syntax-preference}. This is because Viper avoids changing
syntax tables in order to not thwart the various major modes that set these
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-02-27 13:14:36 +0000
+++ b/lisp/ChangeLog 2012-02-28 08:17:21 +0000
@@ -1,3 +1,24 @@
+2012-02-28 Glenn Morris <address@hidden>
+
+ * shell.el (shell-mode):
+ * progmodes/vhdl-mode.el (wildcard-to-regexp, file-expand-wildcards):
+ * play/landmark.el (landmark-font-lock-face-O):
+ * play/handwrite.el (handwrite):
+ * play/gomoku.el (gomoku-O):
+ * net/browse-url.el (browse-url-browser-display):
+ * international/mule.el (define-charset):
+ * htmlfontify.el (hfy-etags-cmd, hfy-face-attr-for-class):
+ * filesets.el (filesets-find-file-delay):
+ * eshell/em-xtra.el (eshell-xtra):
+ * eshell/em-unix.el (eshell-grep):
+ * emulation/viper.el (viper-mode):
+ * emacs-lisp/regexp-opt.el (regexp-opt-group):
+ * emacs-lisp/easymenu.el (easy-menu-define):
+ * calendar/timeclock.el (timeclock-use-display-time):
+ * bs.el (bs-mode):
+ * bookmark.el (bookmark-save-flag):
+ Doc fix (standardize possessive apostrophe usage).
+
2012-02-27 Chong Yidong <address@hidden>
* emulation/viper-cmd.el (viper-intercept-ESC-key): Fix
=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el 2012-01-19 07:21:25 +0000
+++ b/lisp/bookmark.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
-;; Copyright (C) 1993-1997, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1997, 2001-2012 Free Software Foundation, Inc.
;; Author: Karl Fogel <address@hidden>
;; Maintainer: Karl Fogel <address@hidden>
@@ -65,7 +65,7 @@
--> t means save bookmarks when Emacs is killed.
--> Otherwise, it should be a number that is the frequency with which
the bookmark list is saved (i.e.: the number of times which
- Emacs' bookmark list may be modified before it is automatically
+ Emacs's bookmark list may be modified before it is automatically
saved.). If it is a number, Emacs will also automatically save
bookmarks when it is killed.
=== modified file 'lisp/bs.el'
--- a/lisp/bs.el 2012-02-25 23:26:40 +0000
+++ b/lisp/bs.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; bs.el --- menu for selecting and displaying buffers -*- lexical-binding: t
-*-
-;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Olaf Sylvester <address@hidden>
;; Maintainer: Olaf Sylvester <address@hidden>
;; Keywords: convenience
@@ -618,7 +618,7 @@
(put 'bs-mode 'mode-class 'special)
(define-derived-mode bs-mode nil "Buffer-Selection-Menu"
- "Major mode for editing a subset of Emacs' buffers.
+ "Major mode for editing a subset of Emacs's buffers.
\\<bs-mode-map>
Aside from two header lines each line describes one buffer.
Move to a line representing the buffer you want to edit and select
=== modified file 'lisp/calendar/timeclock.el'
--- a/lisp/calendar/timeclock.el 2012-01-19 07:21:25 +0000
+++ b/lisp/calendar/timeclock.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; timeclock.el --- mode for keeping track of how much you work
-;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
;; Created: 25 Mar 1999
@@ -150,7 +150,7 @@
(defcustom timeclock-use-display-time t
"If non-nil, use `display-time-hook' for doing modeline updates.
The advantage of this is that one less timer has to be set running
-amok in Emacs' process space. The disadvantage is that it requires
+amok in Emacs's process space. The disadvantage is that it requires
you to have `display-time' running. If you don't want to use
`display-time', but still want the modeline to show how much time is
left, set this variable to nil. Changing the value of this variable
=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog 2012-02-09 23:31:30 +0000
+++ b/lisp/cedet/ChangeLog 2012-02-28 08:17:21 +0000
@@ -1,3 +1,8 @@
+2012-02-28 Glenn Morris <address@hidden>
+
+ * semantic/db.el (semanticdb-search-results-table):
+ Doc fix (standardize possessive apostrophe usage).
+
2012-02-09 Juanma Barranquero <address@hidden>
* ede/auto.el (ede-directory-safe-p, ede-add-project-to-global-list):
=== modified file 'lisp/cedet/semantic.el'
--- a/lisp/cedet/semantic.el 2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/semantic.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; semantic.el --- Semantic buffer evaluator.
-;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <address@hidden>
;; Keywords: syntax tools
@@ -623,7 +623,7 @@
;;;; Parse the whole system.
((semantic-parse-tree-needs-rebuild-p)
- ;; Use Emacs' built-in progress-reporter
+ ;; Use Emacs's built-in progress-reporter
(let ((semantic--progress-reporter
(and (>= (point-max) semantic-minimum-working-buffer-size)
(eq semantic-working-type 'percent)
@@ -762,7 +762,7 @@
;; Designated to ignore.
(setq stream (car nontermsym))
(if stream
- ;; Use Emacs' built-in progress reporter:
+ ;; Use Emacs's built-in progress reporter:
(and (boundp 'semantic--progress-reporter)
semantic--progress-reporter
(eq semantic-working-type 'percent)
=== modified file 'lisp/cedet/semantic/db-el.el'
--- a/lisp/cedet/semantic/db-el.el 2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/semantic/db-el.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; semantic/db-el.el --- Semantic database extensions for Emacs Lisp
-;;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <address@hidden>
;; Keywords: tags
@@ -132,7 +132,7 @@
"Convert one TAG, originating from Emacs OBJ, into standardized form.
If Emacs cannot resolve this symbol to a particular file, then return nil."
;; Here's the idea. For each tag, get the name, then use
- ;; Emacs' `symbol-file' to get the source. Once we have that,
+ ;; Emacs's `symbol-file' to get the source. Once we have that,
;; we can use more typical semantic searching techniques to
;; get a regularly parsed tag.
(let* ((type (cond ((semantic-tag-of-class-p tag 'function)
=== modified file 'lisp/cedet/semantic/db.el'
--- a/lisp/cedet/semantic/db.el 2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/semantic/db.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; semantic/db.el --- Semantic tag database manager
-;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <address@hidden>
;; Keywords: tags
@@ -205,7 +205,7 @@
)
"Table used for search results when there is no file or table association.
Examples include search results from external sources such as from
-Emacs' own symbol table, or from external libraries.")
+Emacs's own symbol table, or from external libraries.")
(defmethod semanticdb-refresh-table ((obj semanticdb-search-results-table)
&optional force)
"If the tag list associated with OBJ is loaded, refresh it.
=== modified file 'lisp/emacs-lisp/authors.el'
--- a/lisp/emacs-lisp/authors.el 2012-02-23 01:58:53 +0000
+++ b/lisp/emacs-lisp/authors.el 2012-02-28 08:17:21 +0000
@@ -1,4 +1,4 @@
-;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding:
utf-8;-*-
+;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding:
utf-8;-*-
;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
@@ -25,7 +25,7 @@
;;; Commentary:
;; Use M-x authors RET to create an *Authors* buffer that can used as
-;; or merged with Emacs' AUTHORS file.
+;; or merged with Emacs's AUTHORS file.
;;; Code:
=== modified file 'lisp/emacs-lisp/easymenu.el'
--- a/lisp/emacs-lisp/easymenu.el 2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/easymenu.el 2012-02-28 08:17:21 +0000
@@ -99,7 +99,7 @@
KEYS is nil, a string or a vector; nil or a keyboard equivalent to this
menu item.
-This is a hint that will considerably speed up Emacs' first display of
+This is a hint that will considerably speed up Emacs's first display of
a menu. Use `:key-sequence nil' when you know that this menu item has no
keyboard equivalent.
=== modified file 'lisp/emacs-lisp/ert.el'
--- a/lisp/emacs-lisp/ert.el 2012-01-05 09:46:05 +0000
+++ b/lisp/emacs-lisp/ert.el 2012-02-28 08:17:21 +0000
@@ -862,7 +862,7 @@
(make-ert-test-failed :condition condition
:backtrace backtrace
:infos infos))))
- ;; Work around Emacs' heuristic (in eval.c) for detecting
+ ;; Work around Emacs's heuristic (in eval.c) for detecting
;; errors in the debugger.
(incf num-nonmacro-input-events)
;; FIXME: We should probably implement more fine-grained
=== modified file 'lisp/emacs-lisp/ewoc.el'
--- a/lisp/emacs-lisp/ewoc.el 2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/ewoc.el 2012-02-28 08:17:21 +0000
@@ -26,7 +26,7 @@
;;; Commentary:
;; Ewoc Was Once Cookie
-;; But now it's Emacs' Widget for Object Collections
+;; But now it's Emacs's Widget for Object Collections
;; As the name implies this derives from the `cookie' package (part
;; of Elib). The changes are pervasive though mostly superficial:
=== modified file 'lisp/emacs-lisp/regexp-opt.el'
--- a/lisp/emacs-lisp/regexp-opt.el 2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/regexp-opt.el 2012-02-28 08:17:21 +0000
@@ -143,7 +143,7 @@
"Return a regexp to match a string in the sorted list STRINGS.
If PAREN non-nil, output regexp parentheses around returned regexp.
If LAX non-nil, don't output parentheses if it doesn't require them.
-Merges keywords to avoid backtracking in Emacs' regexp matcher."
+Merges keywords to avoid backtracking in Emacs's regexp matcher."
;; The basic idea is to find the shortest common prefix or suffix, remove it
;; and recurse. If there is no prefix, we divide the list into two so that
;; \(at least) one half will have at least a one-character common prefix.
=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el 2012-01-19 07:21:25 +0000
+++ b/lisp/emulation/cua-base.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; cua-base.el --- emulate CUA key bindings
-;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
;; Author: Kim F. Storm <address@hidden>
;; Keywords: keyboard emulations convenience cua
@@ -116,7 +116,7 @@
;; CUA register support
;; --------------------
-;; Emacs' standard register support is also based on a separate set of
+;; Emacs's standard register support is also based on a separate set of
;; "register commands".
;;
;; CUA's register support is activated by providing a numeric
@@ -134,7 +134,7 @@
;; CUA rectangle support
;; ---------------------
-;; Emacs' normal rectangle support is based on interpreting the region
+;; Emacs's normal rectangle support is based on interpreting the region
;; between the mark and point as a "virtual rectangle", and using a
;; completely separate set of "rectangle commands" [C-x r ...] on the
;; region to copy, kill, fill a.s.o. the virtual rectangle.
=== modified file 'lisp/emulation/tpu-edt.el'
--- a/lisp/emulation/tpu-edt.el 2012-02-08 11:18:12 +0000
+++ b/lisp/emulation/tpu-edt.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
-;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc.
;; Author: Rob Riepel <address@hidden>
;; Maintainer: Rob Riepel <address@hidden>
@@ -89,7 +89,7 @@
;; details.
;; Like TPU, Emacs uses multiple buffers. Some buffers are used to hold
-;; files you are editing; other "internal" buffers are used for Emacs' own
+;; files you are editing; other "internal" buffers are used for Emacs's own
;; purposes (like showing you help). Here are some commands for dealing
;; with buffers.
@@ -197,7 +197,7 @@
;; ; Emacs uses Control-s and Control-q. Problems can occur when using
;; ; Emacs on terminals that use these codes for flow control (Xon/Xoff
-;; ; flow control). These lines disable Emacs' use of these characters.
+;; ; flow control). These lines disable Emacs's use of these characters.
;; (global-unset-key "\C-s")
;; (global-unset-key "\C-q")
=== modified file 'lisp/emulation/viper-util.el'
--- a/lisp/emulation/viper-util.el 2012-01-19 07:21:25 +0000
+++ b/lisp/emulation/viper-util.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; viper-util.el --- Utilities used by viper.el
-;; Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
;; Author: Michael Kifer <address@hidden>
;; Package: viper
@@ -295,7 +295,7 @@
result))
;; Emacs used to count each multibyte character as several positions in the
buffer,
-;; so we had to use Emacs' chars-in-region to count characters. Since 20.3,
+;; so we had to use Emacs's chars-in-region to count characters. Since 20.3,
;; Emacs counts multibyte characters as 1 position. XEmacs has always been
;; counting each char as just one pos. So, now we can simply subtract beg from
;; end to determine the number of characters in a region.
@@ -1112,7 +1112,7 @@
lis)))
-;; Smooths out the difference between Emacs' unread-command-events
+;; Smooths out the difference between Emacs's unread-command-events
;; and XEmacs unread-command-event. Arg is a character, an event, a list of
;; events or a sequence of keys.
;;
=== modified file 'lisp/emulation/viper.el'
--- a/lisp/emulation/viper.el 2012-01-19 07:21:25 +0000
+++ b/lisp/emulation/viper.el 2012-02-28 08:17:21 +0000
@@ -87,7 +87,7 @@
;; facility in the original Vi.
;; First, one can execute any Emacs command while defining a
;; macro, not just the Vi commands. Second, macros are defined in a
-;; WYSYWYG mode, using an interface to Emacs' WYSIWYG style of defining
+;; WYSYWYG mode, using an interface to Emacs's WYSIWYG style of defining
;; macros. Third, in Viper, one can define macros that are specific to
;; a given buffer, a given major mode, or macros defined for all buffers.
;; The same macro name can have several different definitions:
@@ -561,7 +561,7 @@
use Emacs productively, you are advised to reach user level 3 or higher.
At user level 2 or higher, ^X and ^C have Emacs, not Vi, bindings;
- ^Z toggles Vi/Emacs states; ^G is Emacs' keyboard-quit (like ^C in Vi).
+ ^Z toggles Vi/Emacs states; ^G is Emacs's keyboard-quit (like ^C in Vi).
2. Vi exit functions (e.g., :wq, ZZ) work on INDIVIDUAL files -- they
do not cause Emacs to quit, except at user level 1 (for a novice).
=== modified file 'lisp/erc/erc-compat.el'
--- a/lisp/erc/erc-compat.el 2012-01-19 07:21:25 +0000
+++ b/lisp/erc/erc-compat.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; erc-compat.el --- ERC compatibility code for XEmacs
-;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
@@ -70,7 +70,7 @@
are placed.
Note that this should end with a directory separator.")
-;; XEmacs' `replace-match' does not replace matching subexpressions in strings.
+;; XEmacs's `replace-match' does not replace matching subexpressions in
strings.
(defun erc-replace-match-subexpression-in-string
(newtext string match subexp start &optional fixedcase literal)
"Replace the subexpression SUBEXP of the last match in STRING with NEWTEXT.
=== modified file 'lisp/eshell/em-unix.el'
--- a/lisp/eshell/em-unix.el 2012-01-28 13:58:46 +0000
+++ b/lisp/eshell/em-unix.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; em-unix.el --- UNIX command aliases
-;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
@@ -712,7 +712,7 @@
(defun eshell-grep (command args &optional maybe-use-occur)
"Generic service function for the various grep aliases.
-It calls Emacs' grep utility if the command is not redirecting output,
+It calls Emacs's grep utility if the command is not redirecting output,
and if it's not part of a command pipeline. Otherwise, it calls the
external command."
(if (and maybe-use-occur eshell-no-grep-available)
=== modified file 'lisp/eshell/em-xtra.el'
--- a/lisp/eshell/em-xtra.el 2012-01-19 07:21:25 +0000
+++ b/lisp/eshell/em-xtra.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; em-xtra.el --- extra alias functions
-;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
@@ -32,7 +32,7 @@
(eshell-defgroup eshell-xtra nil
"This module defines some extra alias functions which are entirely
optional. They can be viewed as samples for how to write Eshell alias
-functions, or as aliases which make some of Emacs' behavior more
+functions, or as aliases which make some of Emacs's behavior more
naturally accessible within Emacs."
:tag "Extra alias functions"
:group 'eshell-module)
=== modified file 'lisp/eshell/eshell.el'
--- a/lisp/eshell/eshell.el 2012-01-19 07:21:25 +0000
+++ b/lisp/eshell/eshell.el 2012-02-28 08:17:21 +0000
@@ -140,12 +140,12 @@
;; paragraph wasn't discovered until two months after I wrote the
;; text; it was not intentional).
;;
-;; @ Emacs' register and bookmarking facilities can be used for
+;; @ Emacs's register and bookmarking facilities can be used for
;; remembering where you've been, and what you've seen -- to varying
;; levels of persistence. They could perhaps even be tied to
;; specific "moments" during eshell execution, which would include
;; the environment at that time, as well as other variables.
-;; Although this would require functionality orthogonal to Emacs'
+;; Although this would require functionality orthogonal to Emacs's
;; own bookmarking facilities, the interface used could be made to
;; operate very similarly.
;;
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2012-02-26 09:08:19 +0000
+++ b/lisp/files.el 2012-02-28 08:17:21 +0000
@@ -22,7 +22,7 @@
;;; Commentary:
-;; Defines most of Emacs's file- and directory-handling functions,
+;; Defines most of Emacs'ss file- and directory-handling functions,
;; including basic file visiting, backup generation, link handling,
;; ITS-id version control, load- and write-hook handling, and the like.
@@ -5259,7 +5259,7 @@
(unlock-buffer)))
(widen)
(let ((coding-system-for-read
- ;; Auto-saved file should be read by Emacs'
+ ;; Auto-saved file should be read by Emacs's
;; internal coding.
(if auto-save-p 'auto-save-coding
(or coding-system-for-read
=== modified file 'lisp/filesets.el'
--- a/lisp/filesets.el 2012-01-19 07:21:25 +0000
+++ b/lisp/filesets.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; filesets.el --- handle group of files
-;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Author: Thomas Link <address@hidden>
;; Maintainer: FSF
@@ -518,7 +518,7 @@
This is for calls via `filesets-find-or-display-file'
or `filesets-find-file'.
-Set this to 0, if you don't use XEmacs' buffer tabs."
+Set this to 0, if you don't use XEmacs's buffer tabs."
:set (function filesets-set-default)
:type 'number
:group 'filesets)
=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2012-02-27 02:34:12 +0000
+++ b/lisp/font-lock.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; font-lock.el --- Electric font lock mode
-;; Copyright (C) 1992-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2012 Free Software Foundation, Inc.
;; Author: Jamie Zawinski
;; Richard Stallman
@@ -67,7 +67,7 @@
;;
;; The syntactic keyword pass places `syntax-table' text properties in the
;; buffer according to the variable `font-lock-syntactic-keywords'. It is
-;; necessary because Emacs' syntax table is not powerful enough to describe all
+;; necessary because Emacs's syntax table is not powerful enough to describe
all
;; the different syntactic constructs required by the sort of people who decide
;; that a single quote can be syntactic or not depending on the time of day.
;; (What sort of person could decide to overload the meaning of a quote?)
=== modified file 'lisp/gnus/gmm-utils.el'
--- a/lisp/gnus/gmm-utils.el 2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/gmm-utils.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
;; Author: Reiner Steib <address@hidden>
;; Keywords: news
@@ -352,7 +352,7 @@
dir (expand-file-name "../" dir))))
(setq image-directory-load-path dir))
- ;; If `image-directory-load-path' isn't Emacs' image directory,
+ ;; If `image-directory-load-path' isn't Emacs's image directory,
;; it's probably a user preference, so use it. Then use a
;; relative setting if possible; otherwise, use
;; `image-directory-load-path'.
@@ -383,7 +383,7 @@
;; Set it to nil if image is not found.
(cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
((file-exists-p (expand-file-name image d1ei)) d1ei)))))
- ;; Use Emacs' image directory.
+ ;; Use Emacs's image directory.
(image-directory-load-path
(setq image-directory image-directory-load-path))
(no-error
=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el 2012-02-01 09:00:42 +0000
+++ b/lisp/gnus/gnus-agent.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; gnus-agent.el --- unplugged support for Gnus
-;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
;; This file is part of GNU Emacs.
@@ -602,7 +602,7 @@
(make-mode-line-mouse-map mouse-button mouse-func)
'mouse-face
(if (and (featurep 'xemacs)
- ;; XEmacs' `facep' only checks for a face
+ ;; XEmacs's `facep' only checks for a face
;; object, not for a face name, so it's useless
;; to check with `facep'.
(find-face 'modeline))
=== modified file 'lisp/gnus/gnus-score.el'
--- a/lisp/gnus/gnus-score.el 2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/gnus-score.el 2012-02-28 08:17:21 +0000
@@ -3028,7 +3028,7 @@
(* (abs score)
gnus-score-decay-scale)))))))
(if (and (featurep 'xemacs)
- ;; XEmacs' floor can handle only the floating point
+ ;; XEmacs's floor can handle only the floating point
;; number below the half of the maximum integer.
(> (abs n) (lsh -1 -2)))
(string-to-number
=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el 2012-02-20 14:25:28 +0000
+++ b/lisp/gnus/mm-decode.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; mm-decode.el --- Functions for decoding MIME things
-;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
;; MORIOKA Tomohiko <address@hidden>
@@ -1493,7 +1493,7 @@
(let ((image (mm-get-image handle)))
(or (not image)
(if (featurep 'xemacs)
- ;; XEmacs' glyphs can actually tell us about their width, so
+ ;; XEmacs's glyphs can actually tell us about their width, so
;; let's be nice and smart about them.
(or mm-inline-large-images
(and (<= (glyph-width image) (window-pixel-width))
=== modified file 'lisp/help.el'
--- a/lisp/help.el 2012-01-19 07:21:25 +0000
+++ b/lisp/help.el 2012-02-28 08:17:21 +0000
@@ -1,7 +1,6 @@
;;; help.el --- help commands for Emacs
-;; Copyright (C) 1985-1986, 1993-1994, 1998-2012
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2012 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help, internal
@@ -24,7 +23,7 @@
;;; Commentary:
-;; This code implements GNU Emacs' on-line help system, the one invoked by
+;; This code implements GNU Emacs's on-line help system, the one invoked by
;; `M-x help-for-help'.
;;; Code:
=== modified file 'lisp/htmlfontify.el'
--- a/lisp/htmlfontify.el 2012-01-19 07:21:25 +0000
+++ b/lisp/htmlfontify.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks
-;; Copyright (C) 2002-2003, 2009-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2009-2012 Free Software Foundation, Inc.
;; Emacs Lisp Archive Entry
;; Package: htmlfontify
@@ -376,7 +376,7 @@
"The etags equivalent command to run in a source directory to generate a tags
file for the whole source tree from there on down. The command should emit
the etags output on stdout.\n
-Two canned commands are provided - they drive Emacs' etags and
+Two canned commands are provided - they drive Emacs's etags and
exuberant-ctags' etags respectively."
:group 'htmlfontify
:tag "etags-command"
@@ -859,13 +859,13 @@
in which case the first face specification returned by `hfy-combined-face-spec'
which *doesn't* clash with CLASS is returned.\n
\(A specification with a class of t is considered to match any class you
-specify - this matches Emacs' behavior when deciding on which face attributes
+specify - this matches Emacs's behavior when deciding on which face attributes
to use, to the best of my understanding).\n
If CLASS is nil, then you just get whatever `face-attr-construct' returns,
ie the current specification in effect for FACE.\n
*NOTE*: This function forces any face that is not 'default and which has
no :inherit property to inherit from 'default (this is because 'default
-is magical in that Emacs' fonts behave as if they inherit implicitly from
+is magical in that Emacs's fonts behave as if they inherit implicitly from
'default, but no such behavior exists in HTML/CSS).\n
See also `hfy-display-class' for details of valid values for CLASS."
(let ((face-spec
=== modified file 'lisp/image.el'
--- a/lisp/image.el 2012-02-08 03:45:27 +0000
+++ b/lisp/image.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; image.el --- image API
-;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: multimedia
@@ -163,7 +163,7 @@
dir (expand-file-name "../" dir))))
(setq image-directory-load-path dir))
- ;; If `image-directory-load-path' isn't Emacs' image directory,
+ ;; If `image-directory-load-path' isn't Emacs's image directory,
;; it's probably a user preference, so use it. Then use a
;; relative setting if possible; otherwise, use
;; `image-directory-load-path'.
@@ -194,7 +194,7 @@
;; Set it to nil if image is not found.
(cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
((file-exists-p (expand-file-name image d1ei)) d1ei)))))
- ;; Use Emacs' image directory.
+ ;; Use Emacs's image directory.
(image-directory-load-path
(setq image-directory image-directory-load-path))
(no-error
=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el 2012-01-21 00:42:09 +0000
+++ b/lisp/international/mule.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; mule.el --- basic commands for multilingual environment
-;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
@@ -165,7 +165,7 @@
VALUE must be a nonnegative integer that can be used as an invalid
code point of the charset. If the minimum code is 0 and the maximum
-code is greater than Emacs' maximum integer value, `:invalid-code'
+code is greater than Emacs's maximum integer value, `:invalid-code'
should not be omitted.
`:code-offset'
=== modified file 'lisp/mail/feedmail.el'
--- a/lisp/mail/feedmail.el 2012-02-11 22:13:29 +0000
+++ b/lisp/mail/feedmail.el 2012-02-28 08:17:21 +0000
@@ -10,7 +10,7 @@
;;; Commentary:
-;; A replacement for parts of Emacs' sendmail.el (specifically,
+;; A replacement for parts of sendmail.el (specifically,
;; it's what handles your outgoing mail after you hit C-c C-c in mail
;; mode). See below for a list of additional features, including the
;; ability to queue messages for later sending. This replaces
=== modified file 'lisp/mh-e/mh-compat.el'
--- a/lisp/mh-e/mh-compat.el 2012-01-19 07:21:25 +0000
+++ b/lisp/mh-e/mh-compat.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; mh-compat.el --- make MH-E compatible with various versions of Emacs
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
;; Author: Bill Wohler <address@hidden>
;; Maintainer: Bill Wohler <address@hidden>
@@ -174,7 +174,7 @@
dir (expand-file-name "../" dir))))
(setq image-directory-load-path dir))
- ;; If `image-directory-load-path' isn't Emacs' image directory,
+ ;; If `image-directory-load-path' isn't Emacs's image directory,
;; it's probably a user preference, so use it. Then use a
;; relative setting if possible; otherwise, use
;; `image-directory-load-path'.
@@ -205,7 +205,7 @@
;; Set it to nil if image is not found.
(cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
((file-exists-p (expand-file-name image d1ei)) d1ei)))))
- ;; Use Emacs' image directory.
+ ;; Use Emacs's image directory.
(image-directory-load-path
(setq image-directory image-directory-load-path))
(no-error
=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el 2012-02-09 03:29:41 +0000
+++ b/lisp/net/browse-url.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; browse-url.el --- pass a URL to a WWW browser
-;; Copyright (C) 1995-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2012 Free Software Foundation, Inc.
;; Author: Denis Howe <address@hidden>
;; Maintainer: FSF
@@ -297,7 +297,7 @@
:group 'browse-url)
(defcustom browse-url-browser-display nil
- "The X display for running the browser, if not same as Emacs'."
+ "The X display for running the browser, if not same as Emacs's."
:type '(choice string (const :tag "Default" nil))
:group 'browse-url)
=== modified file 'lisp/net/eudc.el'
--- a/lisp/net/eudc.el 2012-01-19 07:21:25 +0000
+++ b/lisp/net/eudc.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; eudc.el --- Emacs Unified Directory Client
-;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <address@hidden>
;; Maintainer: Pavel Jan?k <address@hidden>
@@ -133,7 +133,7 @@
(setq plist (cdr (cdr plist))))
nil))
-;; Emacs' plist-get lacks third parameter
+;; Emacs's plist-get lacks third parameter
(defun eudc-plist-get (plist prop &optional default)
"Extract a value from a property list.
PLIST is a property list, which is a list of the form
=== modified file 'lisp/net/secrets.el'
--- a/lisp/net/secrets.el 2012-01-05 09:46:05 +0000
+++ b/lisp/net/secrets.el 2012-02-28 08:17:21 +0000
@@ -78,7 +78,7 @@
;; (secrets-create-collection "my collection")
;; There exists a special collection called "session", which has the
-;; lifetime of the corresponding client session (aka Emacs'
+;; lifetime of the corresponding client session (aka Emacs's
;; lifetime). It is created automatically when Emacs uses the Secret
;; Service interface, and it is deleted when Emacs is killed.
;; Therefore, it can be used to store and retrieve secret items
@@ -99,7 +99,7 @@
;; Secret items can be added or deleted to a collection. In the
;; following examples, we use the special collection "session", which
-;; is bound to Emacs' lifetime.
+;; is bound to Emacs's lifetime.
;;
;; (secrets-delete-item "session" "my item")
;; (secrets-create-item "session" "my item" "geheim"
=== modified file 'lisp/play/gomoku.el'
--- a/lisp/play/gomoku.el 2012-01-19 07:21:25 +0000
+++ b/lisp/play/gomoku.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; gomoku.el --- Gomoku game between you and Emacs
-;; Copyright (C) 1988, 1994, 1996, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 1996, 2001-2012 Free Software Foundation, Inc.
;; Author: Philippe Schnoebelen <address@hidden>
;; Maintainer: FSF
@@ -161,7 +161,7 @@
(defface gomoku-O
'((((class color)) (:foreground "red" :weight bold)))
- "Face to use for Emacs' O."
+ "Face to use for Emacs's O."
:group 'gomoku)
(defface gomoku-X
=== modified file 'lisp/play/handwrite.el'
--- a/lisp/play/handwrite.el 2012-01-19 07:21:25 +0000
+++ b/lisp/play/handwrite.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; handwrite.el --- turns your emacs buffer into a handwritten document -*-
coding: iso-latin-1; -*-
-;; Copyright (C) 1996, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2012 Free Software Foundation, Inc.
;; Author: Danny Roozendaal (was: <address@hidden>)
;; Created: October 21 1996
@@ -189,7 +189,7 @@
(setq next-line-add-newlines t)
(switch-to-buffer ps-buf-name)
(handwrite-insert-header buf-name)
- (insert "%%Creator: GNU Emacs' handwrite version " emacs-version "\n")
+ (insert "%%Creator: GNU Emacs's handwrite version " emacs-version "\n")
(handwrite-insert-preamble)
(handwrite-insert-info)
(handwrite-insert-font)
=== modified file 'lisp/play/landmark.el'
--- a/lisp/play/landmark.el 2012-01-19 07:21:25 +0000
+++ b/lisp/play/landmark.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; landmark.el --- neural-network robot that learns landmarks
-;; Copyright (C) 1996-1997, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2000-2012 Free Software Foundation, Inc.
;; Author: Terrence Brannon (was: <address@hidden>)
;; Created: December 16, 1996 - first release to usenet
@@ -210,7 +210,7 @@
(defface landmark-font-lock-face-O '((((class color)) :foreground "red")
(t :weight bold))
- "Face to use for Emacs' O."
+ "Face to use for Emacs's O."
:version "22.1"
:group 'landmark)
=== modified file 'lisp/progmodes/antlr-mode.el'
--- a/lisp/progmodes/antlr-mode.el 2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/antlr-mode.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; antlr-mode.el --- major mode for ANTLR grammar files
-;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Author: address@hidden
;; Keywords: languages, ANTLR, code generator
@@ -961,7 +961,7 @@
(antlr-re-search-forward
"^\\(private\\|public\\|protected\\)\\>[ \t]*\\(\\(\\sw+[
\t]*\\(:\\)?\\)\\)?"
limit))
- (1 font-lock-type-face) ; not XEmacs' java level-3 fruit salad
+ (1 font-lock-type-face) ; not XEmacs's java level-3 fruit salad
(3 (if (antlr-upcase-p (char-after (match-beginning 3)))
antlr-tokendef-face
antlr-ruledef-face) nil t)
@@ -1030,7 +1030,7 @@
(define-abbrev-table 'antlr-mode-abbrev-table ())
(defvar antlr-slow-cache-enabling-symbol 'loudly
-;; Emacs' font-lock changes buffer's tick counter, therefore this value should
+;; Emacs's font-lock changes buffer's tick counter, therefore this value should
;; be a parameter of a font-lock function, but not any other variable of
;; functions which call `antlr-slow-syntactic-context'.
"If value is a bound symbol, cache will be used even with text changes.
@@ -1113,7 +1113,7 @@
(or (buffer-syntactic-context) (buffer-syntactic-context-depth))
:EMACS
(let ((orig (point)) diff state
- ;; Arg, Emacs' (buffer-modified-tick) changes with font-lock. Use
+ ;; Arg, Emacs's (buffer-modified-tick) changes with font-lock. Use
;; hack that `loudly' is bound during font-locking => cache use will
;; increase from 7% to 99.99% during font-locking.
(tick (or (boundp antlr-slow-cache-enabling-symbol)
=== modified file 'lisp/progmodes/vhdl-mode.el'
--- a/lisp/progmodes/vhdl-mode.el 2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/vhdl-mode.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; vhdl-mode.el --- major mode for editing VHDL code
-;; Copyright (C) 1992-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2012 Free Software Foundation, Inc.
;; Authors: Reto Zimmermann <address@hidden>
;; Rodney J. Whitby <address@hidden>
@@ -2040,7 +2040,7 @@
;; `wildcard-to-regexp' is included only in XEmacs 21
(unless (fboundp 'wildcard-to-regexp)
(defun wildcard-to-regexp (wildcard)
- "Simplified version of `wildcard-to-regexp' from Emacs' `files.el'."
+ "Simplified version of `wildcard-to-regexp' from Emacs's `files.el'."
(let* ((i (string-match "[*?]" wildcard))
(result (substring wildcard 0 i))
(len (length wildcard)))
@@ -2087,7 +2087,7 @@
;; `file-expand-wildcards' undefined (XEmacs)
(unless (fboundp 'file-expand-wildcards)
(defun file-expand-wildcards (pattern &optional full)
- "Taken from Emacs' `files.el'."
+ "Taken from Emacs's `files.el'."
(let* ((nondir (file-name-nondirectory pattern))
(dirpart (file-name-directory pattern))
(dirs (if (and dirpart (string-match "[[*?]" dirpart))
=== modified file 'lisp/shell.el'
--- a/lisp/shell.el 2012-02-19 13:59:42 +0000
+++ b/lisp/shell.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; shell.el --- specialized comint.el for running the shell -*-
lexical-binding: t -*-
-;; Copyright (C) 1988, 1993-1997, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993-1997, 2000-2012 Free Software Foundation, Inc.
;; Author: Olin Shivers <address@hidden>
;; Simon Marshall <address@hidden>
@@ -471,7 +471,7 @@
keep this buffer's default directory the same as the shell's working directory.
While directory tracking is enabled, the shell's working directory is displayed
by \\[list-buffers] or \\[mouse-buffer-menu] in the `File' field.
-\\[dirs] queries the shell and resyncs Emacs' idea of what the current
+\\[dirs] queries the shell and resyncs Emacs's idea of what the current
directory stack is.
\\[shell-dirtrack-mode] turns directory tracking on and off.
\(The `dirtrack' package provides an alternative implementation of this
=== modified file 'lisp/textmodes/sgml-mode.el'
--- a/lisp/textmodes/sgml-mode.el 2012-01-19 07:21:25 +0000
+++ b/lisp/textmodes/sgml-mode.el 2012-02-28 08:17:21 +0000
@@ -62,7 +62,7 @@
:group 'sgml
:type 'hook)
-;; As long as Emacs' syntax can't be complemented with predicates to context
+;; As long as Emacs's syntax can't be complemented with predicates to context
;; sensitively confirm the syntax of characters, we have to live with this
;; kludgy kind of tradeoff.
(defvar sgml-specials '(?\")
=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el 2012-02-10 15:59:29 +0000
+++ b/lisp/vc/diff-mode.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; diff-mode.el --- a mode for viewing/editing context diffs -*-
lexical-binding: t -*-
-;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: convenience patch diff vc
@@ -27,7 +27,7 @@
;; to the corresponding source file.
;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>)
-;; Some efforts were spent to have it somewhat compatible with XEmacs'
+;; Some efforts were spent to have it somewhat compatible with XEmacs's
;; diff-mode as well as with compilation-minor-mode
;; Bugs:
@@ -121,7 +121,7 @@
("{" . diff-file-prev)
("\C-m" . diff-goto-source)
([mouse-2] . diff-goto-source)
- ;; From XEmacs' diff-mode.
+ ;; From XEmacs's diff-mode.
("W" . widen)
;;("." . diff-goto-source) ;display-buffer
;;("f" . diff-goto-source) ;find-file
=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el 2012-01-19 07:21:25 +0000
+++ b/lisp/vc/ediff-util.el 2012-02-28 08:17:21 +0000
@@ -3103,7 +3103,7 @@
;; according to context.
;; If DEFAULT-FILE is set, it should be used as the default value.
;; If DEFAULT-DIR is non-nil, use it as the default directory.
-;; Otherwise, use the value of Emacs' variable `default-directory.'
+;; Otherwise, use the value of `default-directory.'
(defun ediff-read-file-name (prompt default-dir default-file &optional no-dirs)
;; hack default-dir if it is not set
(setq default-dir
=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2012-02-25 04:29:09 +0000
+++ b/lisp/vc/vc-bzr.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; vc-bzr.el --- VC backend for the bzr revision control system
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
;; Author: Dave Love <address@hidden>
;; Riccardo Murri <address@hidden>
@@ -431,7 +431,7 @@
(skip-chars-forward " \n\t") ;Throw away spaces.
(cons status
;; "bzr" will output warnings and informational messages to
- ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
+ ;; stderr; due to Emacs's `vc-do-command' (and, it seems,
;; `start-process' itself) limitations, we cannot catch
stderr
;; and stdout into different buffers. So, if there's
anything
;; left in the buffer after removing the above status
=== modified file 'lisp/w32-fns.el'
--- a/lisp/w32-fns.el 2012-01-19 07:21:25 +0000
+++ b/lisp/w32-fns.el 2012-02-28 08:17:21 +0000
@@ -1,6 +1,6 @@
;;; w32-fns.el --- Lisp routines for 32-bit Windows
-;; Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc.
;; Author: Geoff Voelker <address@hidden>
;; Keywords: internal
@@ -161,7 +161,7 @@
(add-hook 'before-init-hook 'set-default-process-coding-system)
-;;; Basic support functions for managing Emacs' locale setting
+;;; Basic support functions for managing Emacs's locale setting
(defvar w32-valid-locales nil
"List of locale ids known to be supported.")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107455: Standardize possessive apostrophe usage in manuals, docs, and comments,
Glenn Morris <=