Now on revision 110084. ------------------------------------------------------------ revno: 110084 fixes bug: http://debbugs.gnu.org/11440 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-09-18 13:14:42 +0800 message: Doc fixes for defface and friends. * lisp/cus-edit.el (custom-unlispify-remove-prefixes): Add warning. * lisp/custom.el (defface): Doc fix. * doc/lispref/customize.texi (Customization): Define customization more carefully. (Common Keywords): Add xref to Constant Variables. * doc/lispref/display.texi (Faces): Discuss anonymous faces. (Face Attributes): Tweak intro. (Defining Faces): Move after the Face Attributes node. Copyedits. (Displaying Faces): Describe role of inheritance. * doc/lispref/variables.texi (Defining Variables): Link to defcustom's node instead of the higher-level Customization chapter. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-09-11 02:28:27 +0000 +++ doc/lispref/ChangeLog 2012-09-18 05:14:42 +0000 @@ -1,3 +1,17 @@ +2012-09-18 Chong Yidong + + * display.texi (Faces): Discuss anonymous faces. + (Face Attributes): Tweak intro. + (Defining Faces): Move after the Face Attributes node. Copyedits. + (Displaying Faces): Describe role of inheritance. + + * customize.texi (Customization): Define customization more + carefully (Bug#11440). + (Common Keywords): Add xref to Constant Variables. + + * variables.texi (Defining Variables): Link to defcustom's node + instead of the higher-level Customization chapter. + 2012-09-11 Paul Eggert Simplify, document, and port floating-point (Bug#12381). === modified file 'doc/lispref/customize.texi' --- doc/lispref/customize.texi 2012-06-17 05:13:40 +0000 +++ doc/lispref/customize.texi 2012-09-18 05:14:42 +0000 @@ -6,13 +6,30 @@ @chapter Customization Settings @cindex customization item - This chapter describes how to declare customizable variables and -customization groups for classifying them. We use the term -@dfn{customization item} to include customizable variables, -customization groups, as well as faces. + Users of Emacs can customize variables and faces without writing +Lisp code, by using the Customize interface. @xref{Easy +Customization,,, emacs, The GNU Emacs Manual}. This chapter describes +how to define @dfn{customization items} that users can interact with +through the Customize interface. - @xref{Defining Faces}, for the @code{defface} macro, which is used -for declaring customizable faces. + Customization items include customizable variables, which are +defined with the +@ifinfo +@code{defcustom} macro (@pxref{Variable Definitions}); +@end ifinfo +@ifnotinfo +@code{defcustom} macro; +@end ifnotinfo +customizable faces, which are defined with @code{defface} (described +separately in @ref{Defining Faces}); and @dfn{customization groups}, +defined with +@ifinfo +@code{defgroup} (@pxref{Group Definitions}), +@end ifinfo +@ifnotinfo +@code{defgroup}, +@end ifnotinfo +which act as containers for groups of related customization items. @menu * Common Keywords:: Common keyword arguments for all kinds of @@ -29,9 +46,10 @@ @cindex customization keywords The customization declarations that we will describe in the next few -sections (@code{defcustom}, @code{defgroup}, etc.) all accept keyword -arguments for specifying various information. This section describes -keywords that apply to all types of customization declarations. +sections---@code{defcustom}, @code{defgroup}, etc.---all accept +keyword arguments (@pxref{Constant Variables}) for specifying various +information. This section describes keywords that apply to all types +of customization declarations. All of these keywords, except @code{:tag}, can be used more than once in a given item. Each use of the keyword has an independent effect. @@ -188,14 +206,14 @@ @cindex define customization group @cindex customization groups, defining - Each Emacs Lisp package should have one main customization group which -contains all the options, faces and other groups in the package. If the -package has a small number of options and faces, use just one group and -put everything in it. When there are more than twelve or so options and -faces, then you should structure them into subgroups, and put the -subgroups under the package's main customization group. It is OK to -put some of the options and faces in the package's main group alongside -the subgroups. + Each Emacs Lisp package should have one main customization group +which contains all the options, faces and other groups in the package. +If the package has a small number of options and faces, use just one +group and put everything in it. When there are more than twenty or so +options and faces, then you should structure them into subgroups, and +put the subgroups under the package's main customization group. It is +OK to put some of the options and faces in the package's main group +alongside the subgroups. The package's main or only group should be a member of one or more of the standard customization groups. (To display the full list of them, @@ -251,7 +269,17 @@ @node Variable Definitions @section Defining Customization Variables @cindex define customization options -@cindex customization variables, how to define +@cindex customizable variables, how to define +@cindex user options, how to define + + @dfn{Customizable variables}, also called @dfn{user options}, are +global Lisp variables whose values can be set through the Customize +interface. Unlike other global variables, which are defined with +@code{defvar} (@pxref{Defining Variables}), customizable variables are +defined using the @code{defcustom} macro. In addition to calling +@code{defvar} as a subroutine, @code{defcustom} states how the +variable should be displayed in the Customize interface, the values it +is allowed to take, etc. @defmac defcustom option standard doc [keyword value]@dots{} This macro declares @var{option} as a user option (i.e.@: a @@ -291,13 +319,14 @@ standard value after Emacs starts up. @end defmac - @code{defcustom} accepts the following additional keywords: + In addition to the keywords listed in @ref{Common Keywords}, this +macro accepts the following keywords: @table @code @item :type @var{type} Use @var{type} as the data type for this option. It specifies which -values are legitimate, and how to display the value. -@xref{Customization Types}, for more information. +values are legitimate, and how to display the value +(@pxref{Customization Types}). @item :options @var{value-list} @kindex options@r{, @code{defcustom} keyword} === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2012-08-05 09:24:55 +0000 +++ doc/lispref/display.texi 2012-09-18 05:14:42 +0000 @@ -1863,20 +1863,36 @@ A @dfn{face} is a collection of graphical @dfn{attributes} for displaying text: font, foreground color, background color, optional -underlining, and so on. Faces control how Emacs displays text in -buffers, as well as other parts of the frame such as the mode line. -@xref{Standard Faces,,, emacs, The GNU Emacs Manual}, for the list of -faces Emacs normally comes with. - -@cindex face id - For most purposes, you refer to a face in Lisp programs using its -@dfn{face name}, which is usually a Lisp symbol. For backward -compatibility, a face name can also be a string, which is equivalent -to a Lisp symbol of the same name. +underlining, etc. Faces control how Emacs displays text in buffers, +as well as other parts of the frame such as the mode line. + +@cindex anonymous face + One way to represent a face is as a property list of attributes, +like @code{(:foreground "red" :weight bold)}. For example, you can +assign such an @dfn{anonymous face} as the value of the @code{face} +text property; this causes Emacs to display the underlying text with +the specified attributes. @xref{Special Properties}. + +@cindex face name + More commonly, a face is referred to via a @dfn{face name}: a Lisp +symbol which is associated with a set of face attributes. Named faces +are defined using the @code{defface} macro (@pxref{Defining Faces}). +Emacs defines several standard named faces; @xref{Standard Faces,,, +emacs, The GNU Emacs Manual}. + + Many parts of Emacs require named faces, and do not accept anonymous +faces. These include the functions documented in @ref{Attribute +Functions}, and the variable @code{font-lock-keywords} +(@pxref{Search-based Fontification}). Unless otherwise stated, we +will use the term @dfn{face} to refer only to named faces. + + For backward compatibility, you can also use a string to specify a +face name; that is equivalent to a Lisp symbol with the same name. @defun facep object -This function returns a non-@code{nil} value if @var{object} is a Lisp -symbol or string that names a face. Otherwise, it returns @code{nil}. +This function returns a non-@code{nil} value if @var{object} is a +named face: a Lisp symbol or string which serves as a face name. +Otherwise, it returns @code{nil}. @end defun By default, each face name corresponds to the same set of attributes @@ -1884,8 +1900,8 @@ attributes in one frame (@pxref{Attribute Functions}). @menu +* Face Attributes:: What is in a face? * Defining Faces:: How to define a face. -* Face Attributes:: What is in a face? * Attribute Functions:: Functions to examine and set face attributes. * Displaying Faces:: How Emacs combines the faces specified for a character. * Face Remapping:: Remapping faces to alternative definitions. @@ -1900,161 +1916,21 @@ * Low-Level Font:: Lisp representation for character display fonts. @end menu -@node Defining Faces -@subsection Defining Faces - - The @code{defface} macro defines a face and specifies its default -appearance. The user can subsequently customize the face using the -Customize interface (@pxref{Customization}). - -@defmac defface face spec doc [keyword value]@dots{} -This macro declares @var{face} as a customizable face whose default -attributes are given by @var{spec}. You should not quote the symbol -@var{face}, and it should not end in @samp{-face} (that would be -redundant). The argument @var{doc} is a documentation string for the -face. The additional @var{keyword} arguments have the same meanings -as in @code{defgroup} and @code{defcustom} (@pxref{Common Keywords}). - -When @code{defface} executes, it defines the face according to -@var{spec}, then uses any customizations that were read from the -init file (@pxref{Init File}) to override that specification. - -When you evaluate a @code{defface} form with @kbd{C-M-x} in Emacs -Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun} -overrides any customizations of the face. This way, the face reflects -exactly what the @code{defface} says. - -@cindex face specification -The @var{spec} argument is a @dfn{face specification}, which states -how the face should appear on different kinds of terminals. It should -be an alist whose elements each have the form - -@example -(@var{display} . @var{plist}) -@end example - -@noindent -@var{display} specifies a class of terminals (see below), while -@var{plist} is a property list of face attributes and their values, -specifying how the face appears on such terminals -@iftex -(see the next section for details about face attributes). -@end iftex -@ifnottex -(@pxref{Face Attributes}, for details about face attributes). -@end ifnottex - -The @var{display} part of an element of @var{spec} determines which -frames the element matches. If more than one element of @var{spec} -matches a given frame, the first element that matches is the one used -for that frame. There are three possibilities for @var{display}: - -@table @asis -@item @code{default} -This element of @var{spec} doesn't match any frames; instead, it -specifies defaults that apply to all frames. This element, if used, -must be the first element of @var{spec}. Each of the following -elements can override any or all of these defaults. - -@item @code{t} -This element of @var{spec} matches all frames. Therefore, any -subsequent elements of @var{spec} are never used. Normally -@code{t} is used in the last (or only) element of @var{spec}. - -@item a list -If @var{display} is a list, each element should have the form -@code{(@var{characteristic} @var{value}@dots{})}. Here -@var{characteristic} specifies a way of classifying frames, and the -@var{value}s are possible classifications which @var{display} should -apply to. Here are the possible values of @var{characteristic}: - -@table @code -@item type -The kind of window system the frame uses---either @code{graphic} (any -graphics-capable display), @code{x}, @code{pc} (for the MS-DOS console), -@code{w32} (for MS Windows 9X/NT/2K/XP), or @code{tty} -(a non-graphics-capable display). -@xref{Window Systems, window-system}. - -@item class -What kinds of colors the frame supports---either @code{color}, -@code{grayscale}, or @code{mono}. - -@item background -The kind of background---either @code{light} or @code{dark}. - -@item min-colors -An integer that represents the minimum number of colors the frame -should support. This matches a frame if its -@code{display-color-cells} value is at least the specified integer. - -@item supports -Whether or not the frame can display the face attributes given in -@var{value}@dots{} (@pxref{Face Attributes}). @xref{Display Face -Attribute Testing}, for more information on exactly how this testing -is done. -@end table - -If an element of @var{display} specifies more than one @var{value} for a -given @var{characteristic}, any of those values is acceptable. If -@var{display} has more than one element, each element should specify a -different @var{characteristic}; then @emph{each} characteristic of the -frame must match one of the @var{value}s specified for it in -@var{display}. -@end table -@end defmac - - Here's how the standard face @code{highlight} is defined: - -@example -(defface highlight - '((((class color) (min-colors 88) (background light)) - :background "darkseagreen2") - (((class color) (min-colors 88) (background dark)) - :background "darkolivegreen") - (((class color) (min-colors 16) (background light)) - :background "darkseagreen2") - (((class color) (min-colors 16) (background dark)) - :background "darkolivegreen") - (((class color) (min-colors 8)) - :background "green" :foreground "black") - (t :inverse-video t)) - "Basic face for highlighting." - :group 'basic-faces) -@end example - - Internally, Emacs stores the face's default specification in its -@code{face-defface-spec} symbol property (@pxref{Property Lists}). -The @code{saved-face} property stores the face specification saved by -the user, using the customization buffer; the @code{customized-face} -property stores the face specification customized for the current -session, but not saved; and the @code{theme-face} property stores an -alist associating the active customization settings and Custom themes -with their specifications for that face. The face's documentation -string is stored in the @code{face-documentation} property. But -normally you should not try to set any of these properties directly. -@xref{Applying Customizations}, for the @code{custom-set-faces} -function, which is used to apply customized face settings. - - People are sometimes tempted to create variables whose values -specify a face to use. In the vast majority of cases, this is not -necessary; it is preferable to simply use faces directly. - @node Face Attributes @subsection Face Attributes @cindex face attributes - The effect of using a face is determined by a fixed set of @dfn{face -attributes}. This table lists all the face attributes, their possible -values, and their effects. You can specify more than one face for a -given piece of text; Emacs merges the attributes of all the faces to -determine how to display the text. @xref{Displaying Faces}. + @dfn{Face attributes} determine the visual appearance of a face. +The following table lists all the face attributes, their possible +values, and their effects. - In addition to the values given below, each face attribute can also -have the value @code{unspecified}. This special value means the face -doesn't specify that attribute. In face merging, when the first face -fails to specify a particular attribute, the next face gets a chance. -However, the @code{default} face must specify all attributes. + Apart from the values given below, each face attribute can have the +value @code{unspecified}. This special value means that the face +doesn't specify that attribute directly. An @code{unspecified} +attribute tells Emacs to refer instead to a parent face (see the +description @code{:inherit} attribute below); or, failing that, to an +underlying face (@pxref{Displaying Faces}). The @code{default} face +must specify all attributes. Some of these attributes are meaningful only on certain kinds of displays. If your display cannot handle a certain attribute, the @@ -2063,7 +1939,7 @@ @table @code @item :family Font family or fontset (a string). @xref{Fonts,,, emacs, The GNU -Emacs Manual}, for more information about font families; the function +Emacs Manual}, for more information about font families. The function @code{font-family-list} (see below) returns a list of available family names. @xref{Fontsets}, for information about fontsets. @@ -2083,9 +1959,8 @@ units of 1/10 point. The value can also be a floating point number or a function, which -specifies the height relative to an @dfn{underlying face} (i.e., a -face that has a lower priority in the list described in -@ref{Displaying Faces}). If the value is a floating point number, +specifies the height relative to an @dfn{underlying face} +(@pxref{Displaying Faces}). If the value is a floating point number, that specifies the amount by which to scale the height of the underlying face. If the value is a function, that function is called with one argument, the height of the underlying face, and returns the @@ -2261,11 +2136,147 @@ @code{nil} otherwise. @end defun +@node Defining Faces +@subsection Defining Faces + + The usual way to define a face is through the @code{defface} macro. +This macro defines a face name, and associates that name with a set of +face attributes. It also sets up the face so that the user can +customize it via the Customize interface (@pxref{Customization}). + +@defmac defface face spec doc [keyword value]@dots{} +This macro declares @var{face} as a customizable face whose default +attributes are given by @var{spec}. You should not quote the symbol +@var{face}, and it should not end in @samp{-face} (that would be +redundant). The argument @var{doc} is a documentation string for the +face. The additional @var{keyword} arguments have the same meanings +as in @code{defgroup} and @code{defcustom} (@pxref{Common Keywords}). + +When @code{defface} executes, it defines the face according to +@var{spec}, then uses any customizations that were read from the +init file (@pxref{Init File}) to override that specification. + +When you evaluate a @code{defface} form with @kbd{C-M-x} in Emacs +Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun} +overrides any customizations of the face. This way, the face reflects +exactly what the @code{defface} says. + +@cindex face specification +The @var{spec} argument is a @dfn{face specification}, which states +how the face should appear on different kinds of terminals. It should +be an alist whose elements each have the form + +@example +(@var{display} . @var{plist}) +@end example + +@noindent +@var{display} specifies a class of terminals (see below). @var{plist} +is a property list of face attributes and their values, specifying how +the face appears on such terminals. For backward compatibility, you +can also write an element as @code{(@var{display} @var{plist})}. + +The @var{display} part of an element of @var{spec} determines which +terminals the element matches. If more than one element of @var{spec} +matches a given terminal, the first element that matches is the one +used for that terminal. There are three possibilities for +@var{display}: + +@table @asis +@item @code{default} +This element of @var{spec} doesn't match any terminal; instead, it +specifies defaults that apply to all terminals. This element, if +used, must be the first element of @var{spec}. Each of the following +elements can override any or all of these defaults. + +@item @code{t} +This element of @var{spec} matches all terminals. Therefore, any +subsequent elements of @var{spec} are never used. Normally @code{t} +is used in the last (or only) element of @var{spec}. + +@item a list +If @var{display} is a list, each element should have the form +@code{(@var{characteristic} @var{value}@dots{})}. Here +@var{characteristic} specifies a way of classifying terminals, and the +@var{value}s are possible classifications which @var{display} should +apply to. Here are the possible values of @var{characteristic}: + +@table @code +@item type +The kind of window system the terminal uses---either @code{graphic} +(any graphics-capable display), @code{x}, @code{pc} (for the MS-DOS +console), @code{w32} (for MS Windows 9X/NT/2K/XP), or @code{tty} (a +non-graphics-capable display). @xref{Window Systems, window-system}. + +@item class +What kinds of colors the terminal supports---either @code{color}, +@code{grayscale}, or @code{mono}. + +@item background +The kind of background---either @code{light} or @code{dark}. + +@item min-colors +An integer that represents the minimum number of colors the terminal +should support. This matches a terminal if its +@code{display-color-cells} value is at least the specified integer. + +@item supports +Whether or not the terminal can display the face attributes given in +@var{value}@dots{} (@pxref{Face Attributes}). @xref{Display Face +Attribute Testing}, for more information on exactly how this testing +is done. +@end table + +If an element of @var{display} specifies more than one @var{value} for +a given @var{characteristic}, any of those values is acceptable. If +@var{display} has more than one element, each element should specify a +different @var{characteristic}; then @emph{each} characteristic of the +terminal must match one of the @var{value}s specified for it in +@var{display}. +@end table +@end defmac + + Here's how the standard face @code{highlight} is defined: + +@example +(defface highlight + '((((class color) (min-colors 88) (background light)) + :background "darkseagreen2") + (((class color) (min-colors 88) (background dark)) + :background "darkolivegreen") + (((class color) (min-colors 16) (background light)) + :background "darkseagreen2") + (((class color) (min-colors 16) (background dark)) + :background "darkolivegreen") + (((class color) (min-colors 8)) + :background "green" :foreground "black") + (t :inverse-video t)) + "Basic face for highlighting." + :group 'basic-faces) +@end example + + Internally, Emacs stores the face's default specification in its +@code{face-defface-spec} symbol property (@pxref{Property Lists}). +The @code{saved-face} property stores the face specification saved by +the user, using the customization buffer; the @code{customized-face} +property stores the face specification customized for the current +session, but not saved; and the @code{theme-face} property stores an +alist associating the active customization settings and Custom themes +with their specifications for that face. The face's documentation +string is stored in the @code{face-documentation} property. But +normally you should not try to set any of these properties directly. +@xref{Applying Customizations}, for the @code{custom-set-faces} +function, which is used to apply customized face settings. + + People are sometimes tempted to create variables whose values +specify a face to use. In the vast majority of cases, this is not +necessary; it is preferable to simply use faces directly. + @node Attribute Functions @subsection Face Attribute Functions This section describes the functions for accessing and modifying the -attributes of an existing face. +attributes of an existing named face. @defun set-face-attribute face frame &rest arguments This function sets one or more attributes of @var{face} for @@ -2467,8 +2478,12 @@ @node Displaying Faces @subsection Displaying Faces - Here is how Emacs determines the face to use for displaying any -given piece of text: + When Emacs displays a given piece of text, the visual appearance of +the text may be determined by faces drawn from different sources. If +these various sources together specify more than one face for a +particular character, Emacs merges the attributes of the various +faces. Here is the order in which Emacs merges the faces, from +highest to lowest priority: @itemize @bullet @item @@ -2482,11 +2497,11 @@ @item If the text lies within an overlay with a non-@code{nil} @code{face} -property, Emacs applies the face or face attributes specified by that -property. If the overlay has a @code{mouse-face} property and the -mouse is ``near enough'' to the overlay, Emacs applies the face or -face attributes specified by the @code{mouse-face} property instead. -@xref{Overlay Properties}. +property, Emacs applies the face(s) specified by that property. If +the overlay has a @code{mouse-face} property and the mouse is ``near +enough'' to the overlay, Emacs applies the face or face attributes +specified by the @code{mouse-face} property instead. @xref{Overlay +Properties}. When multiple overlays cover one character, an overlay with higher priority overrides those with lower priority. @xref{Overlays}. @@ -2508,11 +2523,12 @@ steps, Emacs applies the attribute of the @code{default} face. @end itemize - If these various sources together specify more than one face for a -particular character, Emacs merges the attributes of the various faces -specified. For each attribute, Emacs tries using the above order -(i.e.@: first the face of any special glyph; then the face for region -highlighting, if appropriate; and so on). + At each stage, if a face has a valid @code{:inherit} attribute, +Emacs treats any attribute with an @code{unspecified} value as having +the corresponding value drawn from the parent face(s). @pxref{Face +Attributes}. Note that the parent face(s) may also leave the +attribute unspecified; in that case, the attribute remains unspecified +at the next level of face merging. @node Face Remapping @subsection Face Remapping === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2012-08-04 14:33:00 +0000 +++ doc/lispref/elisp.texi 2012-09-18 05:14:42 +0000 @@ -1366,8 +1366,8 @@ Faces +* Face Attributes:: What is in a face? * Defining Faces:: How to define a face. -* Face Attributes:: What is in a face? * Attribute Functions:: Functions to examine and set face attributes. * Displaying Faces:: How Emacs combines the faces specified for a character. === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2012-08-04 14:33:00 +0000 +++ doc/lispref/text.texi 2012-09-18 05:14:42 +0000 @@ -2999,12 +2999,11 @@ A face name (a symbol or string). @item -A property list of face attributes. This has the -form (@var{keyword} @var{value} @dots{}), where each @var{keyword} is a -face attribute name and @var{value} is a meaningful value for that -attribute. With this feature, you do not need to create a face each -time you want to specify a particular attribute for certain text. -@xref{Face Attributes}. +A property list of face attributes. This has the form (@var{keyword} +@var{value} @dots{}), where each @var{keyword} is a face attribute +name and @var{value} is a meaningful value for that attribute. With +this feature, you do not need to create a face each time you want to +specify a particular attribute for certain text. @item A list of faces. This specifies a face which is an aggregate of the === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2012-09-07 14:15:59 +0000 +++ doc/lispref/variables.texi 2012-09-18 05:14:42 +0000 @@ -403,7 +403,8 @@ initializes it only if it is originally void. To define a customizable variable, you should use @code{defcustom} -(which calls @code{defvar} as a subroutine). @xref{Customization}. +(which calls @code{defvar} as a subroutine). @xref{Variable +Definitions}. @defspec defvar symbol [value [doc-string]] This special form defines @var{symbol} as a variable. Note that === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-18 04:18:36 +0000 +++ lisp/ChangeLog 2012-09-18 05:14:42 +0000 @@ -1,3 +1,9 @@ +2012-09-18 Chong Yidong + + * custom.el (defface): Doc fix. + + * cus-edit.el (custom-unlispify-remove-prefixes): Add warning. + 2012-09-18 Martin Blais (tiny change) * progmodes/compile.el (compilation-start): Use compilation-always-kill === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2012-08-15 16:29:11 +0000 +++ lisp/cus-edit.el 2012-09-18 05:14:42 +0000 @@ -526,7 +526,10 @@ :type 'boolean) (defcustom custom-unlispify-remove-prefixes nil - "Non-nil means remove group prefixes from option names in buffer." + "Non-nil means remove group prefixes from option names in buffer. +Discarding prefixes often leads to confusing names for options +and faces in Customize buffers, so do not set this to a non-nil +value unless you are sure you know what it does." :group 'custom-menu :group 'custom-buffer :type 'boolean) === modified file 'lisp/custom.el' --- lisp/custom.el 2012-09-17 05:41:04 +0000 +++ lisp/custom.el 2012-09-18 05:14:42 +0000 @@ -350,68 +350,62 @@ Third argument DOC is the face documentation. -If FACE has been set with `custom-set-faces', set the face attributes -as specified by that function, otherwise set the face attributes -according to SPEC. - -The remaining arguments should have the form - - [KEYWORD VALUE]... - +If FACE has been set with `custom-set-faces', set the face +attributes as specified by that function, otherwise set the face +attributes according to SPEC. + +The remaining arguments should have the form [KEYWORD VALUE]... For a list of valid keywords, see the common keywords listed in `defcustom'. -SPEC should be an alist of the form ((DISPLAY ATTS)...). - -In the first element, DISPLAY can be `default'. The ATTS in that -element then act as defaults for all the following elements. - -Aside from that, DISPLAY specifies conditions to match some or -all frames. For each frame, the first element of SPEC where the -DISPLAY conditions are satisfied is the one that applies to that -frame. The ATTRs in this element take effect, and the following -elements are ignored, on that frame. - -In the last element, DISPLAY can be t. That element applies to a -frame if none of the previous elements (except the `default' if -any) did. - -ATTS is a list of face attributes followed by their values: - (ATTR VALUE ATTR VALUE...) - -The possible attributes are `:family', `:width', `:height', `:weight', -`:slant', `:underline', `:overline', `:strike-through', `:box', -`:foreground', `:background', `:stipple', `:inverse-video', and `:inherit'. - -DISPLAY can be `default' (only in the first element), the symbol -t (only in the last element) to match all frames, or an alist of -conditions of the form \(REQ ITEM...). For such an alist to -match a frame, each of the conditions must be satisfied, meaning -that the REQ property of the frame must match one of the -corresponding ITEMs. These are the defined REQ values: - -`type' (the value of `window-system') - Under X, in addition to the values `window-system' can take, - `motif', `lucid', `gtk' and `x-toolkit' are allowed, and match when - the Motif toolkit, Lucid toolkit, GTK toolkit or any X toolkit is in use. - -`class' (the frame's color support) - Should be one of `color', `grayscale', or `mono'. - -`background' (what color is used for the background text) - Should be one of `light' or `dark'. - -`min-colors' (the minimum number of colors the frame should support) - Should be an integer, it is compared with the result of - `display-color-cells'. - -`supports' (only match frames that support the specified face attributes) - Should be a list of face attributes. See the documentation for - the function `display-supports-face-attributes-p' for more - information on exactly how testing is done. - -See Info node `(elisp) Customization' in the Emacs Lisp manual -for more information." +SPEC should be an alist of the form + + ((DISPLAY . ATTS)...) + +where DISPLAY is a form specifying conditions to match certain +terminals and ATTS is a property list (ATTR VALUE ATTR VALUE...) +specifying face attributes and values for frames on those +terminals. On each terminal, the first element with a matching +DISPLAY specification takes effect, and the remaining elements in +SPEC are disregarded. + +As a special exception, in the first element of SPEC, DISPLAY can +be the special value `default'. Then the ATTS in that element +act as defaults for all the following elements. + +For backward compatibility, elements of SPEC can be written +as (DISPLAY ATTS) instead of (DISPLAY . ATTS). + +Each DISPLAY can have the following values: + - `default' (only in the first element). + - The symbol t, which matches all terminals. + - An alist of conditions. Each alist element must have the form + (REQ ITEM...). A matching terminal must satisfy each + specified condition by matching one of its ITEMs. Each REQ + must be one of the following: + - `type' (the terminal type). + Each ITEM must be one of the values returned by + `window-system'. Under X, additional allowed values are + `motif', `lucid', `gtk' and `x-toolkit'. + - `class' (the terminal's color support). + Each ITEM should be one of `color', `grayscale', or `mono'. + - `background' (what color is used for the background text) + Each ITEM should be one of `light' or `dark'. + - `min-colors' (the minimum number of supported colors) + Each ITEM should be an integer, which is compared with the + result of `display-color-cells'. + - `supports' (match terminals supporting certain attributes). + Each ITEM should be a list of face attributes. See + `display-supports-face-attributes-p' for more information on + exactly how testing is done. + +In the ATTS property list, possible attributes are `:family', +`:width', `:height', `:weight', `:slant', `:underline', +`:overline', `:strike-through', `:box', `:foreground', +`:background', `:stipple', `:inverse-video', and `:inherit'. + +See Info node `(elisp) Faces' in the Emacs Lisp manual for more +information." (declare (doc-string 3)) ;; It is better not to use backquote in this file, ;; because that makes a bootstrapping problem ------------------------------------------------------------ revno: 110083 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12288 author: Martin Blais committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-09-18 00:18:36 -0400 message: * lisp/progmodes/compile.el (compilation-start): Use compilation-always-kill to initialize query-on-exit; then test that instead. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 17:38:09 +0000 +++ lisp/ChangeLog 2012-09-18 04:18:36 +0000 @@ -1,3 +1,8 @@ +2012-09-18 Martin Blais (tiny change) + + * progmodes/compile.el (compilation-start): Use compilation-always-kill + to initialize query-on-exit; then test that instead (bug#12288). + 2012-09-17 Stefan Merten * rst.el: Add support for `testcover'. @@ -1702,7 +1707,7 @@ :local as the address. (list-processes): Doc fix. -2012-08-04 Michal Nazarewicz (tiny change) +2012-08-04 Michal Nazarewicz * lisp/mpc.el: Support password in host argument. (mpc--proc-connect): Parse and use new password element. === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2012-09-16 04:31:02 +0000 +++ lisp/progmodes/compile.el 2012-09-18 04:18:36 +0000 @@ -1556,20 +1556,20 @@ (get-buffer-create (compilation-buffer-name name-of-mode mode name-function))) (let ((comp-proc (get-buffer-process (current-buffer)))) - (if comp-proc - (if (or (not (eq (process-status comp-proc) 'run)) - compilation-always-kill - (yes-or-no-p - (format "A %s process is running; kill it? " - name-of-mode))) - (condition-case () - (progn - (interrupt-process comp-proc) - (sit-for 1) - (delete-process comp-proc)) - (error nil)) - (error "Cannot have two processes in `%s' at once" - (buffer-name))))) + (if comp-proc + (if (or (not (eq (process-status comp-proc) 'run)) + (eq (process-query-on-exit-flag comp-proc) nil) + (yes-or-no-p + (format "A %s process is running; kill it? " + name-of-mode))) + (condition-case () + (progn + (interrupt-process comp-proc) + (sit-for 1) + (delete-process comp-proc)) + (error nil)) + (error "Cannot have two processes in `%s' at once" + (buffer-name))))) ;; first transfer directory from where M-x compile was called (setq default-directory thisdir) ;; Make compilation buffer read-only. The filter can still write it. @@ -1624,7 +1624,7 @@ (let ((process-environment (append compilation-environment - (if (if (boundp 'system-uses-terminfo) ; `if' for compiler warning + (if (if (boundp 'system-uses-terminfo);`If' for compiler warning. system-uses-terminfo) (list "TERM=dumb" "TERMCAP=" (format "COLUMNS=%d" (window-width))) @@ -1674,13 +1674,20 @@ nil `("-c" ,command)))) (start-file-process-shell-command (downcase mode-name) outbuf command)))) - ;; Make the buffer's mode line show process state. - (setq mode-line-process - '(:propertize ":%s" face compilation-mode-line-run)) - (set-process-sentinel proc 'compilation-sentinel) - (unless (eq mode t) - ;; Keep the comint filter, since it's needed for proper handling - ;; of the prompts. + ;; Make the buffer's mode line show process state. + (setq mode-line-process + '(:propertize ":%s" face compilation-mode-line-run)) + + ;; Set the process as killable without query by default. + ;; This allows us to start a new compilation without + ;; getting prompted. + (when compilation-always-kill + (set-process-query-on-exit-flag proc nil)) + + (set-process-sentinel proc 'compilation-sentinel) + (unless (eq mode t) + ;; Keep the comint filter, since it's needed for proper + ;; handling of the prompts. (set-process-filter proc 'compilation-filter)) ;; Use (point-max) here so that output comes in ;; after the initial text, ------------------------------------------------------------ revno: 110082 committer: Andreas Schwab branch nick: emacs timestamp: Tue 2012-09-18 00:43:12 +0200 message: * Makefile.in (bootstrap): Revert last change. Run config.status after config.status --recheck, run configure from $(srcdir). (config.status): Run configure from $(srcdir). diff: === modified file 'ChangeLog' --- ChangeLog 2012-09-17 22:35:28 +0000 +++ ChangeLog 2012-09-17 22:43:12 +0000 @@ -1,3 +1,9 @@ +2012-09-17 Andreas Schwab + + * Makefile.in (bootstrap): Revert last change. Run config.status + after config.status --recheck, run configure from $(srcdir). + (config.status): Run configure from $(srcdir). + 2012-09-17 Paul Eggert * Makefile.in: Fix build error on FreeBSD. === modified file 'Makefile.in' --- Makefile.in 2012-09-17 22:35:28 +0000 +++ Makefile.in 2012-09-17 22:43:12 +0000 @@ -367,7 +367,7 @@ if [ -x ./config.status ]; then \ ./config.status --recheck; \ else \ - ./configure $(CONFIGURE_FLAGS); \ + $(srcdir)/configure $(CONFIGURE_FLAGS); \ fi AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4 @@ -895,7 +895,12 @@ # * Do the actual build. bootstrap: bootstrap-clean FRC cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; } - ./configure $(CONFIGURE_FLAGS) + if [ -x config.status ]; then \ + ./config.status --recheck && \ + ./config.status; \ + else \ + $(srcdir)/configure $(CONFIGURE_FLAGS); \ + fi $(MAKE) $(MFLAGS) info all .PHONY: check-declare ------------------------------------------------------------ revno: 110081 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-09-17 15:35:28 -0700 message: * Makefile.in: Run autogen/copy_autogen if autogen.sh fails, to create 'configure'; problem reported by Andreas Schwab in . * autogen.sh: Exit with status 1 when failing due to missing tools, reverting the 2012-09-10 change to this file. * autogen/copy_autogen: Fail if one of the subsidiary actions fail. Use 'cp -f' for the build-aux files, since the destinations are typically read-only. diff: === modified file 'ChangeLog' --- ChangeLog 2012-09-17 21:33:14 +0000 +++ ChangeLog 2012-09-17 22:35:28 +0000 @@ -8,6 +8,14 @@ This undoes part of the 2012-09-10 patch. (bootstrap): Run ./configure, rather than trying to run config.status if it exists. That builds src/epaths.h more reliably. + Run autogen/copy_autogen if autogen.sh fails, + to create 'configure'; problem reported by Andreas Schwab in + . + * autogen.sh: Exit with status 1 when failing due to missing tools, + reverting the 2012-09-10 change to this file. + * autogen/copy_autogen: Fail if one of the subsidiary actions fail. + Use 'cp -f' for the build-aux files, since the destinations are + typically read-only. Remove no-longer-needed Solaris 2.4 vfork bug workaround. * configure.ac (ac_cv_func_vfork_works): Default to 'no' on === modified file 'Makefile.in' --- Makefile.in 2012-09-17 21:33:14 +0000 +++ Makefile.in 2012-09-17 22:35:28 +0000 @@ -890,11 +890,11 @@ # Bootstrapping does the following: # * Remove files to start from a clean slate. -# * Run autogen.sh, but don't worry about exit status 101 (missing tools). +# * Run autogen.sh, falling back on copy_autogen if autogen.sh fails. # * Build Makefile, to build the build procedure itself. # * Do the actual build. bootstrap: bootstrap-clean FRC - cd $(srcdir) && { ./autogen.sh || test $$? -eq 101; } + cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; } ./configure $(CONFIGURE_FLAGS) $(MAKE) $(MFLAGS) info all === modified file 'autogen.sh' --- autogen.sh 2012-09-10 01:03:27 +0000 +++ autogen.sh 2012-09-17 22:35:28 +0000 @@ -201,7 +201,7 @@ Please report any problems with this script to bug-gnu-emacs@gnu.org . EOF - exit 101 # Exit status 101 means tools were missing. + exit 1 fi echo "Your system has the required tools, running autoreconf..." === modified file 'autogen/copy_autogen' --- autogen/copy_autogen 2012-07-09 04:52:49 +0000 +++ autogen/copy_autogen 2012-09-17 22:35:28 +0000 @@ -8,7 +8,7 @@ ## regenerate configure and will fail if you do not have the required ## tools. You will have to run this script again. -test -d autogen && cd autogen +test ! -d autogen || cd autogen || exit if test ! -e config.in; then echo "Cannot find autogen/ directory." @@ -16,11 +16,12 @@ fi ## Order implied by top-level Makefile's rules, for time-stamps. -cp compile config.guess config.sub depcomp install-sh missing ../build-aux -cp aclocal.m4 ../ -cp configure ../ -touch ../src/stamp-h.in -cp config.in ../src/ -cp Makefile.in ../lib/ +cp -f compile config.guess config.sub depcomp install-sh missing \ + ../build-aux && +cp aclocal.m4 ../ && +cp configure ../ && +touch ../src/stamp-h.in && +cp config.in ../src/ && +cp Makefile.in ../lib/ && echo "You can now run configure" ------------------------------------------------------------ revno: 110080 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-09-17 14:33:14 -0700 message: * Makefile.in: Fix build error on FreeBSD. ($(MAKEFILE_NAME)): Pass MAKE='$(MAKE)' to config.status's env. Suggested by Wolfgang Jenker in . (MAKE_CONFIG_STATUS): Remove. Remaining use expanded. This undoes part of the 2012-09-10 patch. (bootstrap): Run ./configure, rather than trying to run config.status if it exists. That builds src/epaths.h more reliably. diff: === modified file 'ChangeLog' --- ChangeLog 2012-09-17 01:02:11 +0000 +++ ChangeLog 2012-09-17 21:33:14 +0000 @@ -1,5 +1,14 @@ 2012-09-17 Paul Eggert + * Makefile.in: Fix build error on FreeBSD. + ($(MAKEFILE_NAME)): Pass MAKE='$(MAKE)' to config.status's env. + Suggested by Wolfgang Jenker in + . + (MAKE_CONFIG_STATUS): Remove. Remaining use expanded. + This undoes part of the 2012-09-10 patch. + (bootstrap): Run ./configure, rather than trying to run config.status + if it exists. That builds src/epaths.h more reliably. + Remove no-longer-needed Solaris 2.4 vfork bug workaround. * configure.ac (ac_cv_func_vfork_works): Default to 'no' on Solaris 2.4, so that AC_FUNC_VFORK doesn't think vfork works. === modified file 'Makefile.in' --- Makefile.in 2012-09-16 18:49:00 +0000 +++ Makefile.in 2012-09-17 21:33:14 +0000 @@ -358,19 +358,17 @@ MAKEFILE_NAME = Makefile $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \ $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) - ./config.status + MAKE='$(MAKE)' ./config.status # Don't erase these files if make is interrupted while refreshing them. .PRECIOUS: Makefile config.status -MAKE_CONFIG_STATUS = \ +config.status: ${srcdir}/configure ${srcdir}/lisp/version.el if [ -x ./config.status ]; then \ ./config.status --recheck; \ else \ ./configure $(CONFIGURE_FLAGS); \ fi -config.status: ${srcdir}/configure ${srcdir}/lisp/version.el - $(MAKE_CONFIG_STATUS) AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4 @@ -897,7 +895,7 @@ # * Do the actual build. bootstrap: bootstrap-clean FRC cd $(srcdir) && { ./autogen.sh || test $$? -eq 101; } - $(MAKE_CONFIG_STATUS) + ./configure $(CONFIGURE_FLAGS) $(MAKE) $(MFLAGS) info all .PHONY: check-declare ------------------------------------------------------------ revno: 110079 fixes bug: http://debbugs.gnu.org/12196 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-09-17 23:11:34 +0300 message: Fix bug #12196 with infloop when cache-long-line-scans is non-nil. src/search.c (scan_buffer): Use character positions in calls to region_cache_forward and region_cache_backward, not byte positions. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-17 07:56:20 +0000 +++ src/ChangeLog 2012-09-17 20:11:34 +0000 @@ -1,5 +1,9 @@ 2012-09-17 Eli Zaretskii + * search.c (scan_buffer): Use character positions in calls to + region_cache_forward and region_cache_backward, not byte + positions. (Bug#12196) + * w32term.c (w32_read_socket): Set pending_signals to 1, like xterm.c does. Reported by Daniel Colascione . === modified file 'src/search.c' --- src/search.c 2012-09-15 07:06:56 +0000 +++ src/search.c 2012-09-17 20:11:34 +0000 @@ -674,7 +674,7 @@ obstacle --- the last character the dumb search loop should examine. */ ptrdiff_t ceiling_byte = CHAR_TO_BYTE (end) - 1; - ptrdiff_t start_byte = CHAR_TO_BYTE (start); + ptrdiff_t start_byte; ptrdiff_t tem; /* If we're looking for a newline, consult the newline cache @@ -684,18 +684,22 @@ ptrdiff_t next_change; immediate_quit = 0; while (region_cache_forward - (current_buffer, newline_cache, start_byte, &next_change)) - start_byte = next_change; + (current_buffer, newline_cache, start, &next_change)) + start = next_change; immediate_quit = allow_quit; + start_byte = CHAR_TO_BYTE (start); + /* START should never be after END. */ if (start_byte > ceiling_byte) start_byte = ceiling_byte; /* Now the text after start is an unknown region, and next_change is the position of the next known region. */ - ceiling_byte = min (next_change - 1, ceiling_byte); + ceiling_byte = min (CHAR_TO_BYTE (next_change) - 1, ceiling_byte); } + else + start_byte = CHAR_TO_BYTE (start); /* The dumb loop can only scan text stored in contiguous bytes. BUFFER_CEILING_OF returns the last character @@ -747,7 +751,7 @@ { /* The last character to check before the next obstacle. */ ptrdiff_t ceiling_byte = CHAR_TO_BYTE (end); - ptrdiff_t start_byte = CHAR_TO_BYTE (start); + ptrdiff_t start_byte; ptrdiff_t tem; /* Consult the newline cache, if appropriate. */ @@ -756,18 +760,22 @@ ptrdiff_t next_change; immediate_quit = 0; while (region_cache_backward - (current_buffer, newline_cache, start_byte, &next_change)) - start_byte = next_change; + (current_buffer, newline_cache, start, &next_change)) + start = next_change; immediate_quit = allow_quit; + start_byte = CHAR_TO_BYTE (start); + /* Start should never be at or before end. */ if (start_byte <= ceiling_byte) start_byte = ceiling_byte + 1; /* Now the text before start is an unknown region, and next_change is the position of the next known region. */ - ceiling_byte = max (next_change, ceiling_byte); + ceiling_byte = max (CHAR_TO_BYTE (next_change), ceiling_byte); } + else + start_byte = CHAR_TO_BYTE (start); /* Stop scanning before the gap. */ tem = BUFFER_FLOOR_OF (start_byte - 1); ------------------------------------------------------------ revno: 110078 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-09-17 15:53:27 -0400 message: Fix typo in previous diff: === modified file 'make-dist' --- make-dist 2012-09-16 18:51:39 +0000 +++ make-dist 2012-09-17 19:53:27 +0000 @@ -408,7 +408,7 @@ echo "Making links to \`nextstep/templates'" (cd nextstep/templates - ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in../../${tempdir}/nextstep/templates) + ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in ../../${tempdir}/nextstep/templates) echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents'" (cd nextstep/Cocoa/Emacs.base/Contents ------------------------------------------------------------ revno: 110077 committer: Stefan Merten branch nick: trunk timestamp: Mon 2012-09-17 19:38:09 +0200 message: 2012-09-17 Stefan Merten * rst.el: Add support for `testcover'. (rst-defcustom-testcover, rst-testcover-add-compose) (rst-testcover-add-1value): New functions. (rst-portable-mark-active-p): Replace by `use-region-p'. (rst-update-section, rst-classify-adornment) (rst-find-title-line): Mark `1value' forms. (rst-classify-adornment): Remove superfluous form. (rst-update-section, rst-get-adornments-around) (rst-adornment-complete-p, rst-get-next-adornment) (rst-adjust, rst-promote-region) (rst-display-adornments-hierarchy, rst-straighten-adornments) (rst-find-pfx-in-region, rst-section-tree-rec) (rst-section-tree-point, rst-toc-insert, rst-toc-insert-node) (rst-toc-node, rst-toc, rst-forward-section) (rst-iterate-leftmost-paragraphs) (rst-iterate-leftmost-paragraphs-2, rst-enumerate-region) (rst-bullet-list-region) (rst-convert-bullets-to-enumeration, rst-font-lock-keywords) (rst-compile-find-conf, rst-compile) (rst-repeat-last-character): Fix style. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 17:15:27 +0000 +++ lisp/ChangeLog 2012-09-17 17:38:09 +0000 @@ -1,3 +1,26 @@ +2012-09-17 Stefan Merten + + * rst.el: Add support for `testcover'. + (rst-defcustom-testcover, rst-testcover-add-compose) + (rst-testcover-add-1value): New functions. + (rst-portable-mark-active-p): Replace by `use-region-p'. + (rst-update-section, rst-classify-adornment) + (rst-find-title-line): Mark `1value' forms. + (rst-classify-adornment): Remove superfluous form. + (rst-update-section, rst-get-adornments-around) + (rst-adornment-complete-p, rst-get-next-adornment) + (rst-adjust, rst-promote-region) + (rst-display-adornments-hierarchy, rst-straighten-adornments) + (rst-find-pfx-in-region, rst-section-tree-rec) + (rst-section-tree-point, rst-toc-insert, rst-toc-insert-node) + (rst-toc-node, rst-toc, rst-forward-section) + (rst-iterate-leftmost-paragraphs) + (rst-iterate-leftmost-paragraphs-2, rst-enumerate-region) + (rst-bullet-list-region) + (rst-convert-bullets-to-enumeration, rst-font-lock-keywords) + (rst-compile-find-conf, rst-compile) + (rst-repeat-last-character): Fix style. + 2012-09-17 Chong Yidong * comint.el (comint--complete-file-name-data): Don't add a space === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2012-09-17 05:41:04 +0000 +++ lisp/textmodes/rst.el 2012-09-17 17:38:09 +0000 @@ -103,11 +103,51 @@ ;;; Code: +;; FIXME: Check through major mode conventions again. + ;; FIXME: Add proper ";;;###autoload" comments. ;; FIXME: When 24.1 is common place remove use of `lexical-let' and put "-*- ;; lexical-binding: t -*-" in the first line. +;; FIXME: Use `testcover'. + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Support for `testcover' + +(when (boundp 'testcover-1value-functions) + ;; Below `lambda' is used in a loop with varying parameters and is thus not + ;; 1valued. + (setq testcover-1value-functions + (delq 'lambda testcover-1value-functions)) + (add-to-list 'testcover-compose-functions 'lambda)) + +(defun rst-testcover-defcustom () + "Remove all customized variables from `testcover-module-constants'. +This seems to be a bug in `testcover': `defcustom' variables are +considered constants. Revert it with this function after each `defcustom'." + (when (boundp 'testcover-module-constants) + (setq testcover-module-constants + (delq nil + (mapcar + (lambda (sym) + (if (not (plist-member (symbol-plist sym) 'standard-value)) + sym)) + testcover-module-constants))))) + +(defun rst-testcover-add-compose (fun) + "Add FUN to `testcover-compose-functions'." + (when (boundp 'testcover-compose-functions) + (add-to-list 'testcover-compose-functions fun))) + +(defun rst-testcover-add-1value (fun) + "Add FUN to `testcover-1value-functions'." + (when (boundp 'testcover-1value-functions) + (add-to-list 'testcover-1value-functions fun))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Common Lisp stuff + ;; Only use of macros is allowed - may be replaced by `cl-lib' some time. (eval-when-compile (require 'cl)) @@ -160,6 +200,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Versions +;; testcover: ok. (defun rst-extract-version (delim-re head-re re tail-re var &optional default) "Extract the version from a variable according to the given regexes. Return the version after regex DELIM-RE and HEAD-RE matching RE @@ -173,7 +214,7 @@ ;; Use CVSHeader to really get information from CVS and not other version ;; control systems. (defconst rst-cvs-header - "$CVSHeader: sm/rst_el/rst.el,v 1.301 2012-07-30 19:29:46 stefan Exp $") + "$CVSHeader: sm/rst_el/rst.el,v 1.309.2.1 2012-09-17 17:30:49 stefan Exp $") (defconst rst-cvs-rev (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+" " .*" rst-cvs-header "0.0") @@ -483,6 +524,8 @@ (defvar rst-re-alist) ; Forward declare to use it in `rst-re'. ;; FIXME: Use `sregex` or `rx` instead of re-inventing the wheel. +(rst-testcover-add-compose 'rst-re) +;; testcover: ok. (defun rst-re (&rest args) "Interpret ARGS as regular expressions and return a regex string. Each element of ARGS may be one of the following: @@ -556,6 +599,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Mode definition +;; testcover: ok. (defun rst-define-key (keymap key def &rest deprecated) "Bind like `define-key' but add deprecated key definitions. KEYMAP, KEY, and DEF are as in `define-key'. DEPRECATED key @@ -734,6 +778,7 @@ The hook for `text-mode' is run before this one." :group 'rst :type '(hook)) +(rst-testcover-defcustom) ;; Pull in variable definitions silencing byte-compiler. (require 'newcomment) @@ -949,6 +994,7 @@ (const :tag "Underline only" simple)) (integer :tag "Indentation for overline and underline type" :value 0)))) +(rst-testcover-defcustom) (defcustom rst-default-indent 1 "Number of characters to indent the section title. @@ -958,7 +1004,7 @@ style." :group 'rst-adjust :type '(integer)) - +(rst-testcover-defcustom) (defun rst-compare-adornments (ado1 ado2) "Compare adornments. @@ -979,7 +1025,8 @@ (setq cur (cdr cur))) cur)) - +;; testcover: FIXME: Test with `rst-preferred-adornments' == nil. Add test +;; `rst-adjust-no-preference'. (defun rst-suggest-new-adornment (allados &optional prev) "Suggest a new, different adornment from all that have been seen. @@ -1032,7 +1079,7 @@ len) ;; Fixup whitespace at the beginning and end of the line. - (if (or (null indent) (eq style 'simple)) + (if (or (null indent) (eq style 'simple)) ;; testcover: ok. (setq indent 0)) (beginning-of-line) (delete-horizontal-space) @@ -1046,7 +1093,8 @@ ;; Remove previous line if it is an adornment. (save-excursion - (forward-line -1) + (forward-line -1) ;; testcover: FIXME: Doesn't work when in first line + ;; of buffer. (if (and (looking-at (rst-re 'ado-beg-2-1)) ;; Avoid removing the underline of a title right above us. (save-excursion (forward-line -1) @@ -1055,7 +1103,8 @@ ;; Remove following line if it is an adornment. (save-excursion - (forward-line +1) + (forward-line +1) ;; testcover: FIXME: Doesn't work when in last line + ;; of buffer. (if (looking-at (rst-re 'ado-beg-2-1)) (rst-delete-entire-line)) ;; Add a newline if we're at the end of the buffer, for the subsequence @@ -1071,13 +1120,14 @@ (insert (make-string len char)))) ;; Insert underline. - (forward-line +1) + (1value ;; Line has been inserted above. + (forward-line +1)) (open-line 1) (insert (make-string len char)) - (forward-line +1) - (goto-char marker) - )) + (1value ;; Line has been inserted above. + (forward-line +1)) + (goto-char marker))) (defun rst-classify-adornment (adornment end) "Classify adornment for section titles and transitions. @@ -1104,11 +1154,14 @@ (ado-re (rst-re ado-ch 'adorep3-hlp)) (end-pnt (point)) (beg-pnt (progn - (forward-line 0) + (1value ;; No lines may be left to move. + (forward-line 0)) (point))) (nxt-emp ; Next line nonexistent or empty (save-excursion (or (not (zerop (forward-line 1))) + ;; testcover: FIXME: Add test classifying at the end of + ;; buffer. (looking-at (rst-re 'lin-end))))) (prv-emp ; Previous line nonexistent or empty (save-excursion @@ -1117,7 +1170,9 @@ (ttl-blw ; Title found below starting here. (save-excursion (and - (zerop (forward-line 1)) + (zerop (forward-line 1)) ;; testcover: FIXME: Add test + ;; classifying at the end of + ;; buffer. (looking-at (rst-re 'ttl-beg)) (point)))) (ttl-abv ; Title found above starting here. @@ -1129,7 +1184,9 @@ (und-fnd ; Matching underline found starting here. (save-excursion (and ttl-blw - (zerop (forward-line 2)) + (zerop (forward-line 2)) ;; testcover: FIXME: Add test + ;; classifying at the end of + ;; buffer. (looking-at (rst-re ado-re 'lin-end)) (point)))) (ovr-fnd ; Matching overline found starting here. @@ -1174,8 +1231,8 @@ (setq key nil))) (if key (list key - (or beg-ovr beg-txt beg-und) - (or end-und end-txt end-ovr) + (or beg-ovr beg-txt) + (or end-und end-txt) beg-ovr end-ovr beg-txt end-txt beg-und end-und))))))) (defun rst-find-title-line () @@ -1193,7 +1250,8 @@ CHARACTER is also nil and match groups for overline and underline are nil." (save-excursion - (forward-line 0) + (1value ;; No lines may be left to move. + (forward-line 0)) (let ((orig-pnt (point)) (orig-end (line-end-position))) (cond @@ -1253,6 +1311,7 @@ `rst-all-sections'.") (make-variable-buffer-local 'rst-section-hierarchy) +(rst-testcover-add-1value 'rst-reset-section-caches) (defun rst-reset-section-caches () "Reset all section cache variables. Should be called by interactive functions which deal with sections." @@ -1354,9 +1413,7 @@ (if (and cur (caar cur)) (setq next (if (= curline (caar cur)) (cdr cur) cur))) - (mapcar 'cdar (list prev next)) - )) - + (mapcar 'cdar (list prev next)))) (defun rst-adornment-complete-p (ado) "Return true if the adornment ADO around point is complete." @@ -1369,8 +1426,7 @@ (let* ((char (car ado)) (style (cadr ado)) (indent (caddr ado)) - (endcol (save-excursion (end-of-line) (current-column))) - ) + (endcol (save-excursion (end-of-line) (current-column)))) (if char (let ((exps (rst-re "^" char (format "\\{%d\\}" (+ endcol indent)) "$"))) (and @@ -1380,9 +1436,7 @@ (or (not (eq style 'over-and-under)) (save-excursion (forward-line -1) (beginning-of-line) - (looking-at exps)))) - )) - )) + (looking-at exps)))))))) (defun rst-get-next-adornment @@ -1414,8 +1468,7 @@ cur)) ;; If not found, take the first of all adornments. - suggestion - ))) + suggestion))) ;; FIXME: A line "``/`` full" is not accepted as a section title. @@ -1456,7 +1509,7 @@ (reverse-direction (and pfxarg (< (prefix-numeric-value pfxarg) 0))) (toggle-style (and pfxarg (not reverse-direction)))) - (if (rst-portable-mark-active-p) + (if (use-region-p) ;; Adjust adornments within region. (rst-promote-region (and pfxarg t)) ;; Adjust adornment around point. @@ -1466,15 +1519,14 @@ (run-hooks 'rst-adjust-hook) ;; Make sure to reset the cursor position properly after we're done. - (goto-char origpt) - - )) + (goto-char origpt))) (defcustom rst-adjust-hook nil "Hooks to be run after running `rst-adjust'." :group 'rst-adjust :type '(hook) :package-version '(rst . "1.1.0")) +(rst-testcover-defcustom) (defcustom rst-new-adornment-down nil "Controls level of new adornment for section headers." @@ -1483,6 +1535,7 @@ (const :tag "Same level as previous one" nil) (const :tag "One level down relative to the previous one" t)) :package-version '(rst . "1.1.0")) +(rst-testcover-defcustom) (defun rst-adjust-adornment (pfxarg) "Call `rst-adjust-adornment-work' interactively. @@ -1741,8 +1794,7 @@ (region-begin-line (line-number-at-pos (region-beginning))) (region-end-line (line-number-at-pos (region-end))) - marker-list - ) + marker-list) ;; Skip the markers that come before the region beginning. (while (and cur (< (caar cur) region-begin-line)) @@ -1771,8 +1823,7 @@ ;; Clear marker to avoid slowing down the editing after we're done. (set-marker (car p) nil)) - (setq deactivate-mark nil) - ))) + (setq deactivate-mark nil)))) @@ -1792,9 +1843,7 @@ (apply 'rst-update-section x) (goto-char (point-max)) (insert "\n") - (incf level) - )) - ))) + (incf level)))))) (defun rst-straighten-adornments () "Redo all the adornments in the current buffer. @@ -1822,10 +1871,7 @@ (apply 'rst-update-section (nth (car lm) rst-preferred-adornments)) ;; Reset the marker to avoid slowing down editing until it gets GC'ed. - (set-marker (cdr lm) nil) - ) - ))) - + (set-marker (cdr lm) nil))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1906,7 +1952,7 @@ (looking-at pfx-re)))))) ; ...pfx at same level. (push (cons (point) (current-column)) pfx)) - (forward-line 1)) ) + (forward-line 1))) (nreverse pfx))) (defun rst-insert-list-pos (newitem) @@ -2005,6 +2051,7 @@ :tag (char-to-string char) char)) rst-bullets))) :package-version '(rst . "1.1.0")) +(rst-testcover-defcustom) (defun rst-insert-list-continue (curitem prefer-roman) "Insert a list item with list start CURITEM including its indentation level. @@ -2206,8 +2253,7 @@ (setq node (cons nil (cdaar children)))) ;; Return this node with its children. - (cons node children) - )) + (cons node children))) (defun rst-section-tree-point (node &optional point) @@ -2241,11 +2287,8 @@ (let ((sub (rst-section-tree-point (car last) curpoint))) (setq path (car sub) outtree (cdr sub))) - (setq outtree node)) - - ))) - (cons (cons (car node) path) outtree) - )) + (setq outtree node))))) + (cons (cons (car node) path) outtree))) (defgroup rst-toc nil @@ -2257,6 +2300,7 @@ "Indentation for table-of-contents display. Also used for formatting insertion, when numbering is disabled." :group 'rst-toc) +(rst-testcover-defcustom) (defcustom rst-toc-insert-style 'fixed "Insertion style for table-of-contents. @@ -2267,10 +2311,12 @@ - aligned: numbering, titles aligned under each other - listed: numbering, with dashes like list items (EXPERIMENTAL)" :group 'rst-toc) +(rst-testcover-defcustom) (defcustom rst-toc-insert-number-separator " " "Separator that goes between the TOC number and the title." :group 'rst-toc) +(rst-testcover-defcustom) ;; This is used to avoid having to change the user's mode. (defvar rst-toc-insert-click-keymap @@ -2282,7 +2328,7 @@ (defcustom rst-toc-insert-max-level nil "If non-nil, maximum depth of the inserted TOC." :group 'rst-toc) - +(rst-testcover-defcustom) (defun rst-toc-insert (&optional pfxarg) "Insert a simple text rendering of the table of contents. @@ -2316,8 +2362,7 @@ (delete-region init-point (+ init-point (length initial-indent))) ;; Delete the last newline added. - (delete-char -1) - ))) + (delete-char -1)))) (defun rst-toc-insert-node (node level indent pfx) "Insert tree node NODE in table-of-contents. @@ -2343,9 +2388,7 @@ ;; is generated automatically. (put-text-property b (point) 'mouse-face 'highlight) (put-text-property b (point) 'rst-toc-target (cadar node)) - (put-text-property b (point) 'keymap rst-toc-insert-click-keymap) - - ) + (put-text-property b (point) 'keymap rst-toc-insert-click-keymap)) (insert "\n") ;; Prepare indent for children. @@ -2362,9 +2405,7 @@ ((eq rst-toc-insert-style 'listed) (concat (substring indent 0 -3) - (concat (make-string (+ (length pfx) 2) ? ) " - "))) - )) - ) + (concat (make-string (+ (length pfx) 2) ? ) " - ")))))) (if (or (eq rst-toc-insert-max-level nil) (< level rst-toc-insert-max-level)) @@ -2382,8 +2423,7 @@ (if (cdr node) (setq fmt (format "%%-%dd" (1+ (floor (log10 (length - (cdr node)))))))) - )) + (cdr node)))))))))) (dolist (child (cdr node)) (rst-toc-insert-node child @@ -2391,9 +2431,7 @@ indent (if do-child-numbering (concat pfx (format fmt count)) pfx)) - (incf count))) - - ))) + (incf count)))))) (defun rst-toc-update () @@ -2468,8 +2506,7 @@ ;; Add link on lines. (put-text-property b (point) 'rst-toc-target (cadar node)) - (insert "\n") - )) + (insert "\n"))) (dolist (child (cdr node)) (rst-toc-node child (1+ level)))) @@ -2517,8 +2554,7 @@ line ;; Create a temporary buffer. - (buf (get-buffer-create rst-toc-buffer-name)) - ) + (buf (get-buffer-create rst-toc-buffer-name))) (with-current-buffer buf (let ((inhibit-read-only t)) @@ -2531,8 +2567,7 @@ ;; Count the lines to our found node. (let ((linefound (rst-toc-count-lines sectree our-node))) - (setq line (if (cdr linefound) (car linefound) 0))) - )) + (setq line (if (cdr linefound) (car linefound) 0))))) (display-buffer buf) (pop-to-buffer buf) @@ -2541,8 +2576,7 @@ ;; Move the cursor near the right section in the TOC. (goto-char (point-min)) - (forward-line (1- line)) - )) + (forward-line (1- line)))) (defun rst-toc-mode-find-section () @@ -2644,8 +2678,7 @@ (curline (line-number-at-pos)) (cur allados) - (idx 0) - ) + (idx 0)) ;; Find the index of the "next" adornment w.r.t. to the current line. (while (and cur (< (caar cur) curline)) @@ -2666,8 +2699,7 @@ (progn (goto-char (point-min)) (forward-line (1- (car cur)))) - (if (> offset 0) (goto-char (point-max)) (goto-char (point-min)))) - )) + (if (> offset 0) (goto-char (point-max)) (goto-char (point-min)))))) (defun rst-backward-section () "Like `rst-forward-section', except move back one title." @@ -2686,7 +2718,7 @@ (error "Cannot mark zero sections")) (cond ((and allow-extend (or (and (eq last-command this-command) (mark t)) - (rst-portable-mark-active-p))) + (use-region-p))) (set-mark (save-excursion (goto-char (mark)) @@ -2742,17 +2774,14 @@ (valid (and (= curcol leftcol) (not (looking-at (rst-re 'lin-end)))) (and (= curcol leftcol) - (not (looking-at (rst-re 'lin-end))))) - ) + (not (looking-at (rst-re 'lin-end)))))) ((>= (point) endm)) (if (if ,first-only (and valid (not previous)) valid) ,body-consequent - ,body-alternative) - - )))) + ,body-alternative))))) ;; FIXME: This needs to be refactored. Probably this is simply a function ;; applying BODY rather than a macro. @@ -2785,13 +2814,10 @@ (,isleftmost (and (not ,isempty) (= (current-column) ,leftmost)) (and (not ,isempty) - (= (current-column) ,leftmost))) - ) + (= (current-column) ,leftmost)))) ((>= (point) endm)) - (progn ,@body) - - ))))) + (progn ,@body)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Indentation @@ -2817,26 +2843,31 @@ "Indentation when there is no more indentation point given." :group 'rst-indent :type '(integer)) +(rst-testcover-defcustom) (defcustom rst-indent-field 3 "Indentation for first line after a field or 0 to always indent for content." :group 'rst-indent :type '(integer)) +(rst-testcover-defcustom) (defcustom rst-indent-literal-normal 3 "Default indentation for literal block after a markup on an own line." :group 'rst-indent :type '(integer)) +(rst-testcover-defcustom) (defcustom rst-indent-literal-minimized 2 "Default indentation for literal block after a minimized markup." :group 'rst-indent :type '(integer)) +(rst-testcover-defcustom) (defcustom rst-indent-comment 3 "Default indentation for first line of a comment." :group 'rst-indent :type '(integer)) +(rst-testcover-defcustom) ;; FIXME: Must consider other tabs: ;; * Line blocks @@ -3116,8 +3147,7 @@ (let ((ins-string (format "%d. " (incf count)))) (setq last-insert-len (length ins-string)) (insert ins-string)) - (insert (make-string last-insert-len ?\ )) - ))) + (insert (make-string last-insert-len ?\ ))))) (defun rst-bullet-list-region (beg end all) "Add bullets to all the leftmost paragraphs in the given region. @@ -3127,8 +3157,7 @@ (rst-iterate-leftmost-paragraphs beg end (not all) (insert (car rst-preferred-bullets) " ") - (insert " ") - )) + (insert " "))) ;; FIXME: Does not deal with a varying number of digits appropriately. ;; FIXME: Does not deal with multiple levels independently. @@ -3143,18 +3172,13 @@ (cons (copy-marker (car x)) (cdr x))) (rst-find-pfx-in-region beg end (rst-re 'itmany-sta-1)))) - (count 1) - ) + (count 1)) (save-excursion (dolist (x items) (goto-char (car x)) (looking-at (rst-re 'itmany-beg-1)) (replace-match (format "%d." count) nil nil nil 1) - (incf count) - )) - )) - - + (incf count))))) ;;------------------------------------------------------------------------------ @@ -3202,6 +3226,7 @@ :version "24.1" :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-block-face "customize the face `rst-block' instead." "24.1") @@ -3216,6 +3241,7 @@ :version "24.1" :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-external-face "customize the face `rst-external' instead." "24.1") @@ -3230,6 +3256,7 @@ :version "24.1" :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-definition-face "customize the face `rst-definition' instead." "24.1") @@ -3246,6 +3273,7 @@ "Directives and roles." :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-directive-face "customize the face `rst-directive' instead." "24.1") @@ -3260,6 +3288,7 @@ :version "24.1" :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-comment-face "customize the face `rst-comment' instead." "24.1") @@ -3274,6 +3303,7 @@ :version "24.1" :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-emphasis1-face "customize the face `rst-emphasis1' instead." "24.1") @@ -3287,6 +3317,7 @@ "Double emphasis." :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-emphasis2-face "customize the face `rst-emphasis2' instead." "24.1") @@ -3301,6 +3332,7 @@ :version "24.1" :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-literal-face "customize the face `rst-literal' instead." "24.1") @@ -3315,6 +3347,7 @@ :version "24.1" :group 'rst-faces :type '(face)) +(rst-testcover-defcustom) (make-obsolete-variable 'rst-reference-face "customize the face `rst-reference' instead." "24.1") @@ -3368,6 +3401,7 @@ :group 'rst-faces-defaults :type '(integer) :set 'rst-set-level-default) +(rst-testcover-defcustom) ;; FIXME: It should be possible to give "#RRGGBB" type of color values. ;; Together with a `rst-level-face-end-light' this could be used for ;; computing steps. @@ -3378,6 +3412,7 @@ :group 'rst-faces-defaults :type '(string) :set 'rst-set-level-default) +(rst-testcover-defcustom) ;; FIXME LEVEL-FACE: This needs to be done differently: The faces must specify ;; how they behave for dark and light background using the ;; relevant options explained in `defface'. @@ -3391,12 +3426,14 @@ :group 'rst-faces-defaults :type '(integer) :set 'rst-set-level-default) +(rst-testcover-defcustom) (defcustom rst-level-face-format-light "%2d" "The format for the lightness factor appended to the base name of the color. This value is expanded by `format' with an integer." :group 'rst-faces-defaults :type '(string) :set 'rst-set-level-default) +(rst-testcover-defcustom) ;; FIXME LEVEL-FACE: This needs to be done differently: The faces must specify ;; how they behave for dark and light background using the ;; relevant options explained in `defface'. @@ -3420,6 +3457,7 @@ :group 'rst-faces-defaults :type '(integer) :set 'rst-set-level-default) +(rst-testcover-defcustom) (defcustom rst-adornment-faces-alist ;; FIXME LEVEL-FACE: Must be redone if `rst-level-face-max' is changed @@ -3447,6 +3485,7 @@ (const :tag "section title adornment" nil)) :value-type (face)) :set-after '(rst-level-face-max)) +(rst-testcover-defcustom) (defun rst-define-level-faces () "Define the faces for the section title text faces from the values." @@ -3663,8 +3702,7 @@ ;; Indentation is not required for doctest blocks. (,(rst-re 'lin-beg '(:grp (:alt ">>>" ell-tag)) '(:grp ".+")) (1 rst-block-face) - (2 rst-literal-face)) - ) + (2 rst-literal-face))) "Keywords to highlight in rst mode.") (defvar font-lock-beg) @@ -3974,6 +4012,7 @@ (string :tag "Options")))) :group 'rst :package-version "1.2.0") +(rst-testcover-defcustom) ;; FIXME: Must be `defcustom`. (defvar rst-compile-primary-toolset 'html @@ -3999,11 +4038,8 @@ (setq prevdir dir) (setq dir (expand-file-name (file-name-directory (directory-file-name - (file-name-directory dir))))) - ) - (or (and dir (concat dir file-name)) nil) - ))) - + (file-name-directory dir)))))) + (or (and dir (concat dir file-name)) nil)))) (require 'compile) @@ -4041,8 +4077,7 @@ ;; Invoke the compile command. (if (or compilation-read-command use-alt) (call-interactively 'compile) - (compile compile-command)) - )) + (compile compile-command)))) (defun rst-compile-alt-toolset () "Compile command with the alternative tool-set." @@ -4166,8 +4201,7 @@ (cond ((equal last-command 'rst-repeat-last-character) (if (= curcol fill-column) prevcol fill-column)) (t (save-excursion - (if (zerop prevcol) fill-column prevcol))) - )) ) + (if (zerop prevcol) fill-column prevcol)))))) (end-of-line) (if (> (current-column) rightmost-column) ;; Shave characters off the end. @@ -4176,17 +4210,7 @@ (point)) ;; Fill with last characters. (insert-char (preceding-char) - (- rightmost-column (current-column)))) - )) - - -(defun rst-portable-mark-active-p () - "Return non-nil if the mark is active. -This is a portable function." - (cond - ((fboundp 'region-active-p) (region-active-p)) - ((boundp 'transient-mark-mode) (and transient-mark-mode mark-active)) - (t mark-active))) + (- rightmost-column (current-column)))))) ------------------------------------------------------------ revno: 110076 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-09-17 13:15:27 -0400 message: Add ChangeLog bug refs diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 14:45:51 +0000 +++ lisp/ChangeLog 2012-09-17 17:15:27 +0000 @@ -11,9 +11,10 @@ * mail/rmailmm.el (rmail-mime-toggle-raw): Do rmail-mime-insert only in the mime-shown mode, not in raw mode. (rmail-mime): Toggle off mime by displaying the message without - mime processing. + mime processing. (Bug#12305) - * mail/rmail.el (rmail-retry-failure): Turn off mime processing first. + * mail/rmail.el (rmail-retry-failure): + Turn off mime processing first. (Bug#12037) * epa-mail.el (epa-mail-encrypt): Fix bug when a name has no key. ------------------------------------------------------------ revno: 110075 fixes bug: http://debbugs.gnu.org/12092 committer: Chong Yidong branch nick: trunk timestamp: Mon 2012-09-17 22:45:51 +0800 message: Make pcomplete less eager to add an extra space. * comint.el (comint--complete-file-name-data): Don't add a space if the status is `sole'; that adds a gratuitous space in the completion-cycling case. * pcomplete.el (pcomplete-completions-at-point): Likewise. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 11:49:10 +0000 +++ lisp/ChangeLog 2012-09-17 14:45:51 +0000 @@ -1,3 +1,11 @@ +2012-09-17 Chong Yidong + + * comint.el (comint--complete-file-name-data): Don't add a space + if the status is `sole'; that adds a gratuitous space in the + completion-cycling case (Bug#12092). + + * pcomplete.el (pcomplete-completions-at-point): Likewise. + 2012-09-17 Richard Stallman * mail/rmailmm.el (rmail-mime-toggle-raw): Do rmail-mime-insert === modified file 'lisp/comint.el' --- lisp/comint.el 2012-09-17 05:41:04 +0000 +++ lisp/comint.el 2012-09-17 14:45:51 +0000 @@ -3161,8 +3161,8 @@ (complete-with-action action table string pred)))) (unless (zerop (length filesuffix)) (list :exit-function - (lambda (_s finished) - (when (memq finished '(sole finished)) + (lambda (_s status) + (when (eq status 'finished) (if (looking-at (regexp-quote filesuffix)) (goto-char (match-end 0)) (insert filesuffix))))))))) === modified file 'lisp/pcomplete.el' --- lisp/pcomplete.el 2012-09-17 05:41:04 +0000 +++ lisp/pcomplete.el 2012-09-17 14:45:51 +0000 @@ -451,9 +451,12 @@ (list beg (point) table :predicate pred :exit-function + ;; If completion is finished, add a terminating space. + ;; We used to also do this if STATUS is `sole', but + ;; that does not work right when completion cycling. (unless (zerop (length pcomplete-termination-string)) - (lambda (_s finished) - (when (memq finished '(sole finished)) + (lambda (_s status) + (when (eq status 'finished) (if (looking-at (regexp-quote pcomplete-termination-string)) (goto-char (match-end 0)) ------------------------------------------------------------ revno: 110074 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2012-09-17 15:22:45 +0200 message: nt/config.nt: Sync with autogen/config.in. (BROKEN_SA_RESTART, SYNC_INPUT): Remove. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-09-17 00:56:08 +0000 +++ nt/ChangeLog 2012-09-17 13:22:45 +0000 @@ -1,3 +1,8 @@ +2012-09-17 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (BROKEN_SA_RESTART, SYNC_INPUT): Remove. + 2012-09-17 Glenn Morris * config.nt (COPYRIGHT): New. === modified file 'nt/config.nt' --- nt/config.nt 2012-09-17 00:56:08 +0000 +++ nt/config.nt 2012-09-17 13:22:45 +0000 @@ -63,9 +63,6 @@ /* Define on FreeBSD to work around an issue when reading from a PTY. */ #undef BROKEN_PTY_READ_AFTER_EAGAIN -/* Define if SA_RESTART should only be used in batch mode. */ -#undef BROKEN_SA_RESTART - /* Define if the system is compatible with BSD 4.2. */ #undef BSD4_2 @@ -1308,9 +1305,6 @@ /* Define to 1 on System V Release 4. */ #undef SVR4 -/* Process async input synchronously. */ -#undef SYNC_INPUT - /* Define to use system malloc. */ #undef SYSTEM_MALLOC ------------------------------------------------------------ revno: 110073 committer: Richard Stallman branch nick: trunk timestamp: Mon 2012-09-17 07:49:10 -0400 message: When toggling mime processing off, just don't do mime processing. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 11:44:48 +0000 +++ lisp/ChangeLog 2012-09-17 11:49:10 +0000 @@ -1,5 +1,10 @@ 2012-09-17 Richard Stallman + * mail/rmailmm.el (rmail-mime-toggle-raw): Do rmail-mime-insert + only in the mime-shown mode, not in raw mode. + (rmail-mime): Toggle off mime by displaying the message without + mime processing. + * mail/rmail.el (rmail-retry-failure): Turn off mime processing first. * epa-mail.el (epa-mail-encrypt): Fix bug when a name has no key. === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2012-05-09 03:06:08 +0000 +++ lisp/mail/rmailmm.el 2012-09-17 11:49:10 +0000 @@ -389,13 +389,13 @@ ;; Enter the raw mode. (rmail-mime-raw-mode entity) ;; Enter the shown mode. - (rmail-mime-shown-mode entity)) - (let ((inhibit-read-only t) - (modified (buffer-modified-p))) - (save-excursion - (goto-char (aref segment 1)) - (rmail-mime-insert entity) - (restore-buffer-modified-p modified))))) + (rmail-mime-shown-mode entity) + (let ((inhibit-read-only t) + (modified (buffer-modified-p))) + (save-excursion + (goto-char (aref segment 1)) + (rmail-mime-insert entity) + (restore-buffer-modified-p modified)))))) (defun rmail-mime-toggle-hidden () "Hide or show the body of the MIME-entity at point." @@ -1212,7 +1212,7 @@ (if (rmail-mime-display-header current) (delete-char (- (aref segment 2) (aref segment 1)))) (insert-buffer-substring rmail-mime-mbox-buffer - (aref header 0) (aref header 1))) + (aref header 0) (aref header 1))) ;; tagline (if (rmail-mime-display-tagline current) (delete-char (- (aref segment 3) (aref segment 2)))) @@ -1261,14 +1261,17 @@ (interactive (list current-prefix-arg nil)) (if rmail-enable-mime (with-current-buffer rmail-buffer - (if (rmail-mime-message-p) - (let ((rmail-mime-mbox-buffer rmail-view-buffer) - (rmail-mime-view-buffer rmail-buffer) - (entity (get-text-property - (progn - (or arg (goto-char (point-min))) - (point)) 'rmail-mime-entity))) - (if (or (not arg) entity) (rmail-mime-toggle-raw state))) + (if (or (rmail-mime-message-p) + (get-text-property (point-min) 'rmail-mime-hidden)) + (let* ((hidden (get-text-property (point-min) 'rmail-mime-hidden)) + (desired-hidden (if state (eq state 'raw) (not hidden)))) + (unless (eq hidden desired-hidden) + (if (not desired-hidden) + (rmail-show-message rmail-current-message) + (let ((rmail-enable-mime nil) + (inhibit-read-only t)) + (rmail-show-message rmail-current-message) + (add-text-properties (point-min) (point-max) '(rmail-mime-hidden t)))))) (message "Not a MIME message, just toggling headers") (rmail-toggle-header))) (let* ((data (rmail-apply-in-message rmail-current-message 'buffer-string)) ------------------------------------------------------------ revno: 110072 committer: Richard Stallman branch nick: trunk timestamp: Mon 2012-09-17 07:44:48 -0400 message: rmail-retry-failure must avoid mime processing. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 09:49:55 +0000 +++ lisp/ChangeLog 2012-09-17 11:44:48 +0000 @@ -1,5 +1,7 @@ 2012-09-17 Richard Stallman + * mail/rmail.el (rmail-retry-failure): Turn off mime processing first. + * epa-mail.el (epa-mail-encrypt): Fix bug when a name has no key. 2012-09-17 Chong Yidong === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2012-08-17 20:38:47 +0000 +++ lisp/mail/rmail.el 2012-09-17 11:44:48 +0000 @@ -4068,6 +4068,13 @@ specifying headers which should not be copied into the new message." (interactive) (require 'mail-utils) + (if rmail-enable-mime + (with-current-buffer rmail-buffer + (if (rmail-mime-message-p) + (let ((rmail-mime-mbox-buffer rmail-view-buffer) + (rmail-mime-view-buffer rmail-buffer)) + (rmail-mime-toggle-raw 'raw))))) + (let ((rmail-this-buffer (current-buffer)) (msgnum rmail-current-message) bounce-start bounce-end bounce-indent resending @@ -4598,7 +4605,7 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "cd7656f82944d0b92b0d093a5f3a4c36") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "0c18b83f914803d1216e1a9df7ea5275") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ ------------------------------------------------------------ revno: 110071 committer: Richard Stallman branch nick: trunk timestamp: Mon 2012-09-17 07:41:39 -0400 message: message-in-body-p should not alter anything. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-09-17 11:39:41 +0000 +++ lisp/gnus/ChangeLog 2012-09-17 11:41:39 +0000 @@ -1,5 +1,7 @@ 2012-09-17 Richard Stallman + * message.el (message-in-body-p): Don't set mark or modify buffer. + * mml.el (mml-attach-file): Doc fix. (mml-attach-external, mml-attach-buffer, mml-attach-file): Set mail-encode-mml when in Mail mode. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2012-09-05 22:35:32 +0000 +++ lisp/gnus/message.el 2012-09-17 11:41:39 +0000 @@ -3160,8 +3160,12 @@ (defun message-in-body-p () "Return t if point is in the message body." - (let ((body (save-excursion (message-goto-body)))) - (>= (point) body))) + (>= (point) + (save-excursion + (goto-char (point-min)) + (or (search-forward (concat "\n" mail-header-separator "\n") nil t) + (search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t)) + (point)))) (defun message-goto-eoh () "Move point to the end of the headers." ------------------------------------------------------------ revno: 110070 committer: Richard Stallman branch nick: trunk timestamp: Mon 2012-09-17 07:39:41 -0400 message: Handle Mail mode correctly. Some code cleanup. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-09-13 11:14:30 +0000 +++ lisp/gnus/ChangeLog 2012-09-17 11:39:41 +0000 @@ -1,3 +1,12 @@ +2012-09-17 Richard Stallman + + * mml.el (mml-attach-file): Doc fix. + (mml-attach-external, mml-attach-buffer, mml-attach-file): + Set mail-encode-mml when in Mail mode. + Simplify code to set HEAD and move back to HEAD. + (mml-insert-multipart, mml-insert-part): + Set mail-encode-mml when in Mail mode. + 2012-09-13 Katsumi Yamaoka * gnus-util.el (gnus-timer--function): New function. === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/mml.el 2012-09-17 11:39:41 +0000 @@ -1305,7 +1305,8 @@ (defun mml-attach-file (file &optional type description disposition) "Attach a file to the outgoing MIME message. The file is not inserted or encoded until you send the message with -`\\[message-send-and-exit]' or `\\[message-send]'. +`\\[message-send-and-exit]' or `\\[message-send]' in Message mode, +or `\\[mail-send-and-exit]' or `\\[mail-send]' in Mail mode. FILE is the name of the file to attach. TYPE is its content-type, a string of the form \"type/subtype\". DESCRIPTION @@ -1319,11 +1320,9 @@ (description (mml-minibuffer-read-description)) (disposition (mml-minibuffer-read-disposition type nil file))) (list file type description disposition))) - ;; Don't move point if this command is invoked inside the message header. - (let ((head (unless (message-in-body-p) - (prog1 - (point) - (goto-char (point-max)))))) + ;; If in the message header, attach at the end and leave point unchanged. + (let ((head (unless (message-in-body-p) (point)))) + (if head (goto-char (point-max))) (mml-insert-empty-tag 'part 'type type ;; icicles redefines read-file-name and returns a @@ -1331,12 +1330,15 @@ 'filename (mm-substring-no-properties file) 'disposition (or disposition "attachment") 'description description) + ;; When using Mail mode, make sure it does the mime encoding + ;; when you send the message. + (or (eq mail-user-agent 'message-user-agent) + (setq mail-encode-mml t)) (when head - (unless (prog1 - (pos-visible-in-window-p) - (goto-char head)) + (unless (pos-visible-in-window-p) (message "The file \"%s\" has been attached at the end of the message" - (file-name-nondirectory file)))))) + (file-name-nondirectory file))) + (goto-char head)))) (defun mml-dnd-attach-file (uri action) "Attach a drag and drop file. @@ -1372,21 +1374,22 @@ (description (mml-minibuffer-read-description)) (disposition (mml-minibuffer-read-disposition type nil))) (list buffer type description disposition))) - ;; Don't move point if this command is invoked inside the message header. - (let ((head (unless (message-in-body-p) - (prog1 - (point) - (goto-char (point-max)))))) + ;; If in the message header, attach at the end and leave point unchanged. + (let ((head (unless (message-in-body-p) (point)))) + (if head (goto-char (point-max))) (mml-insert-empty-tag 'part 'type type 'buffer buffer 'disposition disposition 'description description) + ;; When using Mail mode, make sure it does the mime encoding + ;; when you send the message. + (or (eq mail-user-agent 'message-user-agent) + (setq mail-encode-mml t)) (when head - (unless (prog1 - (pos-visible-in-window-p) - (goto-char head)) + (unless (pos-visible-in-window-p) (message "The buffer \"%s\" has been attached at the end of the message" - buffer))))) + buffer)) + (goto-char head)))) (defun mml-attach-external (file &optional type description) "Attach an external file into the buffer. @@ -1397,19 +1400,20 @@ (type (mml-minibuffer-read-type file)) (description (mml-minibuffer-read-description))) (list file type description))) - ;; Don't move point if this command is invoked inside the message header. - (let ((head (unless (message-in-body-p) - (prog1 - (point) - (goto-char (point-max)))))) + ;; If in the message header, attach at the end and leave point unchanged. + (let ((head (unless (message-in-body-p) (point)))) + (if head (goto-char (point-max))) (mml-insert-empty-tag 'external 'type type 'name file 'disposition "attachment" 'description description) + ;; When using Mail mode, make sure it does the mime encoding + ;; when you send the message. + (or (eq mail-user-agent 'message-user-agent) + (setq mail-encode-mml t)) (when head - (unless (prog1 - (pos-visible-in-window-p) - (goto-char head)) + (unless (pos-visible-in-window-p) (message "The file \"%s\" has been attached at the end of the message" - (file-name-nondirectory file)))))) + (file-name-nondirectory file))) + (goto-char head)))) (defun mml-insert-multipart (&optional type) (interactive (if (message-in-body-p) @@ -1422,12 +1426,20 @@ (or type (setq type "mixed")) (mml-insert-empty-tag "multipart" 'type type) + ;; When using Mail mode, make sure it does the mime encoding + ;; when you send the message. + (or (eq mail-user-agent 'message-user-agent) + (setq mail-encode-mml t)) (forward-line -1)) (defun mml-insert-part (&optional type) (interactive (if (message-in-body-p) (list (mml-minibuffer-read-type "")) (error "Use this command in the message body"))) + ;; When using Mail mode, make sure it does the mime encoding + ;; when you send the message. + (or (eq mail-user-agent 'message-user-agent) + (setq mail-encode-mml t)) (mml-insert-tag 'part 'type type 'disposition "inline")) (declare-function message-subscribed-p "message" ()) ------------------------------------------------------------ revno: 110069 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-09-17 06:17:50 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-09-03 10:17:43 +0000 +++ autogen/Makefile.in 2012-09-17 10:17:50 +0000 @@ -787,6 +787,7 @@ cache_file = @cache_file@ canonical = @canonical@ configuration = @configuration@ +copyright = @copyright@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ === modified file 'autogen/config.in' --- autogen/config.in 2012-09-15 10:17:37 +0000 +++ autogen/config.in 2012-09-17 10:17:50 +0000 @@ -59,9 +59,6 @@ /* Define on FreeBSD to work around an issue when reading from a PTY. */ #undef BROKEN_PTY_READ_AFTER_EAGAIN -/* Define if SA_RESTART should only be used in batch mode. */ -#undef BROKEN_SA_RESTART - /* Define if the system is compatible with BSD 4.2. */ #undef BSD4_2 @@ -82,6 +79,9 @@ his/her Emacs. */ #undef CLASH_DETECTION +/* Short copyright string for this version of Emacs. */ +#undef COPYRIGHT + /* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP systems. This function is required for 'alloca.c' support on those systems. */ @@ -1295,9 +1295,6 @@ /* Define to 1 on System V Release 4. */ #undef SVR4 -/* Process async input synchronously. */ -#undef SYNC_INPUT - /* Define to use system malloc. */ #undef SYSTEM_MALLOC === modified file 'autogen/configure' --- autogen/configure 2012-09-15 10:17:37 +0000 +++ autogen/configure 2012-09-17 10:17:50 +0000 @@ -1143,6 +1143,7 @@ canonical configuration version +copyright KRB4LIB DESLIB KRB5LIB @@ -1330,8 +1331,7 @@ PATH_SEPARATOR SHELL' ac_subst_files='deps_frag -lisp_frag -ns_frag' +lisp_frag' ac_user_opts=' enable_option_checking with_all @@ -1343,7 +1343,6 @@ with_mail_unlink with_mailhost with_sound -with_sync_input with_x_toolkit with_wide_int with_xpm @@ -2061,7 +2060,6 @@ --with-mailhost=HOSTNAME string giving default POP mail host --without-sound don't compile with sound support - --without-sync-input don't process async input synchronously --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk, gtk2, gtk3, lucid or athena, motif, no) --with-wide-int prefer wide Emacs integers (typically 62-bit) @@ -3933,20 +3931,6 @@ -# Check whether --with-sync-input was given. -if test "${with_sync_input+set}" = set; then : - withval=$with_sync_input; -else - with_sync_input=$with_features -fi - -if test "$with_sync_input" = yes; then - -$as_echo "#define SYNC_INPUT 1" >>confdefs.h - -fi - - # Check whether --with-x-toolkit was given. if test "${with_x_toolkit+set}" = set; then : withval=$with_x_toolkit; case "${withval}" in @@ -9414,13 +9398,13 @@ ns_appdir=`pwd`/nextstep/Emacs.app ns_appbindir=${ns_appdir}/Contents/MacOS ns_appresdir=${ns_appdir}/Contents/Resources - ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base + ns_appsrc=Cocoa/Emacs.base elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes ns_appdir=`pwd`/nextstep/Emacs.app ns_appbindir=${ns_appdir} ns_appresdir=${ns_appdir}/Resources - ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base + ns_appsrc=GNUstep/Emacs.base GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)" @@ -9510,7 +9494,6 @@ INSTALL_ARCH_INDEP_EXTRA=install-etc ns_self_contained=no -ns_frag=/dev/null NS_OBJ= NS_OBJC_OBJ= if test "${HAVE_NS}" = yes; then @@ -9534,7 +9517,6 @@ leimdir="\${ns_appresdir}/leim" INSTALL_ARCH_INDEP_EXTRA= fi - ns_frag=$srcdir/src/ns.mk NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" fi CFLAGS="$tmp_CFLAGS" @@ -9545,7 +9527,6 @@ - ## $window_system is now set to the window system we will ## ultimately use. @@ -14508,6 +14489,11 @@ $as_echo "no" >&6; } fi +case $canonical in + *-solaris2.4 | *-solaris2.4.*) + : ${ac_cv_func_vfork_works=no};; +esac + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" if test "x$ac_cv_type_pid_t" = x""yes; then : @@ -15767,9 +15753,6 @@ hpux11) -$as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h - - $as_echo "#define USG_SUBTTY_WORKS 1" >>confdefs.h ;; @@ -15804,6 +15787,14 @@ version=$PACKAGE_VERSION +copyright="Copyright (C) 2012 Free Software Foundation, Inc." + +cat >>confdefs.h <<_ACEOF +#define COPYRIGHT "$copyright" +_ACEOF + + + ### Specify what sort of things we'll be editing into Makefile and config.h. ### Use configuration here uncanonicalized to avoid exceeding size limits. @@ -24391,9 +24382,19 @@ test "${exec_prefix}" != NONE && exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` -SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile" - -ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile" +if test "$HAVE_NS" = "yes"; then + if test "$NS_IMPL_GNUSTEP" = yes; then + ac_config_files="$ac_config_files nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:nextstep/templates/Info-gnustep.plist.in nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:nextstep/templates/Emacs.desktop.in" + + else + ac_config_files="$ac_config_files nextstep/Cocoa/Emacs.base/Contents/Info.plist:nextstep/templates/Info.plist.in nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:nextstep/templates/InfoPlist.strings.in" + + fi +fi + +SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" + +ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" opt_makefile=test/automated/Makefile @@ -25233,6 +25234,10 @@ case $ac_config_target in "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist") CONFIG_FILES="$CONFIG_FILES nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:nextstep/templates/Info-gnustep.plist.in" ;; + "nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop") CONFIG_FILES="$CONFIG_FILES nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:nextstep/templates/Emacs.desktop.in" ;; + "nextstep/Cocoa/Emacs.base/Contents/Info.plist") CONFIG_FILES="$CONFIG_FILES nextstep/Cocoa/Emacs.base/Contents/Info.plist:nextstep/templates/Info.plist.in" ;; + "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings") CONFIG_FILES="$CONFIG_FILES nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:nextstep/templates/InfoPlist.strings.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;; @@ -25245,6 +25250,7 @@ "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;; "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; + "nextstep/Makefile") CONFIG_FILES="$CONFIG_FILES nextstep/Makefile" ;; "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;; "admin/unidata/Makefile") CONFIG_FILES="$CONFIG_FILES admin/unidata/Makefile" ;; "mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;; ------------------------------------------------------------ revno: 110068 committer: Richard Stallman branch nick: trunk timestamp: Mon 2012-09-17 05:49:55 -0400 message: Fix bug when a name has no key. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 05:41:04 +0000 +++ lisp/ChangeLog 2012-09-17 09:49:55 +0000 @@ -1,3 +1,7 @@ +2012-09-17 Richard Stallman + + * epa-mail.el (epa-mail-encrypt): Fix bug when a name has no key. + 2012-09-17 Chong Yidong * shell.el (shell-file-name-chars, shell-file-name-quote-list) === modified file 'lisp/epa-mail.el' --- lisp/epa-mail.el 2012-03-10 08:43:27 +0000 +++ lisp/epa-mail.el 2012-09-17 09:49:55 +0000 @@ -170,24 +170,26 @@ If no one is selected, symmetric encryption will be performed. " recipients) (if recipients - (mapcar - (lambda (recipient) - (setq recipient-key - (epa-mail--find-usable-key - (epg-list-keys - (epg-make-context epa-protocol) - (if (string-match "@" recipient) - (concat "<" recipient ">") - recipient)) - 'encrypt)) - (unless (or recipient-key - (y-or-n-p - (format - "No public key for %s; skip it? " - recipient))) - (error "No public key for %s" recipient)) - recipient-key) - recipients))) + (apply + 'nconc + (mapcar + (lambda (recipient) + (setq recipient-key + (epa-mail--find-usable-key + (epg-list-keys + (epg-make-context epa-protocol) + (if (string-match "@" recipient) + (concat "<" recipient ">") + recipient)) + 'encrypt)) + (unless (or recipient-key + (y-or-n-p + (format + "No public key for %s; skip it? " + recipient))) + (error "No public key for %s" recipient)) + (if recipient-key (list recipient-key))) + recipients)))) (setq sign (if verbose (y-or-n-p "Sign? "))) (if sign (epa-select-keys context ------------------------------------------------------------ revno: 110067 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-09-17 11:22:32 +0300 message: Fix a typo in a comment. diff: === modified file 'src/ralloc.c' --- src/ralloc.c 2012-09-17 07:54:32 +0000 +++ src/ralloc.c 2012-09-17 08:22:32 +0000 @@ -1208,7 +1208,7 @@ the relocatable blocks much less often. The number used to be 64, but alloc.c would override that with 32 in code that was removed when SYNC_INPUT became the only input handling mode. - That code was condition on !DOUG_LEA_MALLOC, so the call to + That code was conditioned on !DOUG_LEA_MALLOC, so the call to mallopt above is left unchanged. (Actually, I think there's no system nowadays that uses DOUG_LEA_MALLOC and also uses REL_ALLOC.) */ ------------------------------------------------------------ revno: 110066 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-09-17 10:56:20 +0300 message: Set pending_signals to 1 in w32term.c's read-socket hook. src/w32term.c (w32_read_socket): Set pending_signals to 1, like xterm.c does. Reported by Daniel Colascione . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-17 07:54:32 +0000 +++ src/ChangeLog 2012-09-17 07:56:20 +0000 @@ -1,5 +1,8 @@ 2012-09-17 Eli Zaretskii + * w32term.c (w32_read_socket): Set pending_signals to 1, like + xterm.c does. Reported by Daniel Colascione . + * ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize __malloc_extra_blocks to 32 instead of 64, like alloc.c did in emacs_blocked_malloc, now deleted. === modified file 'src/w32term.c' --- src/w32term.c 2012-09-15 08:03:11 +0000 +++ src/w32term.c 2012-09-17 07:56:20 +0000 @@ -4162,6 +4162,7 @@ if (interrupt_input_blocked) { interrupt_input_pending = 1; + pending_signals = 1; return -1; } ------------------------------------------------------------ revno: 110065 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-09-17 10:54:32 +0300 message: Fix the value of __malloc_extra_blocks. src/ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize __malloc_extra_blocks to 32 instead of 64, like alloc.c did in emacs_blocked_malloc, now deleted. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-17 01:02:11 +0000 +++ src/ChangeLog 2012-09-17 07:54:32 +0000 @@ -1,3 +1,9 @@ +2012-09-17 Eli Zaretskii + + * ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize + __malloc_extra_blocks to 32 instead of 64, like alloc.c did in + emacs_blocked_malloc, now deleted. + 2012-09-17 Paul Eggert Remove no-longer-needed Solaris 2.4 vfork bug workaround. === modified file 'src/ralloc.c' --- src/ralloc.c 2012-09-15 07:06:56 +0000 +++ src/ralloc.c 2012-09-17 07:54:32 +0000 @@ -1204,9 +1204,15 @@ UNBLOCK_INPUT; #else #ifndef SYSTEM_MALLOC - /* Give GNU malloc's morecore some hysteresis - so that we move all the relocatable blocks much less often. */ - __malloc_extra_blocks = 64; + /* Give GNU malloc's morecore some hysteresis so that we move all + the relocatable blocks much less often. The number used to be + 64, but alloc.c would override that with 32 in code that was + removed when SYNC_INPUT became the only input handling mode. + That code was condition on !DOUG_LEA_MALLOC, so the call to + mallopt above is left unchanged. (Actually, I think there's no + system nowadays that uses DOUG_LEA_MALLOC and also uses + REL_ALLOC.) */ + __malloc_extra_blocks = 32; #endif #endif ------------------------------------------------------------ revno: 110064 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-09-17 00:35:17 -0700 message: * admin/admin.el (add-log-time-format): Declare. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-09-17 07:22:17 +0000 +++ admin/ChangeLog 2012-09-17 07:35:17 +0000 @@ -1,5 +1,7 @@ 2012-09-17 Glenn Morris + * admin.el (add-log-time-format): Declare. + * admin.el (cusver-scan, cusver-check): Bind local variables. * admin.el (set-version): Set major version in === modified file 'admin/admin.el' --- admin/admin.el 2012-09-17 07:22:17 +0000 +++ admin/admin.el 2012-09-17 07:35:17 +0000 @@ -26,6 +26,8 @@ ;;; Code: +(defvar add-log-time-format) ; in add-log + (defun add-release-logs (root version) "Add \"Version VERSION released.\" change log entries in ROOT. Root must be the root of an Emacs source tree." @@ -415,7 +417,7 @@ (setq done t)) (t (if (eobp) - (error "Parse error in %s" f)) + (error "Parse error in %s" f)) ; f is bound in manual-html-node (unless open-td (setq done t)))) (forward-line 1)))) ------------------------------------------------------------ revno: 110063 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-09-17 00:22:17 -0700 message: Reduce version number duplication in etc/refcards * etc/refcards/emacsver.tex: New file. * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * refcards/emacsver.tex, etc/refcards/fr-dired-ref.tex: * etc/refcards/fr-refcard.tex, etc/refcards/fr-survival.tex: * etc/refcards/orgcard.tex, etc/refcards/pl-refcard.tex: * etc/refcards/pt-br-refcard.tex, etc/refcards/refcard.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex, etc/refcards/survival.tex: * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: Include emacsver.tex. * refcards/calccard.tex (\emacsversionnumber): Rename to \versionemacs, same as all the other refcards. * etc/refcards/Makefile (ENVADD): New variable. (sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf) (%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi): Depend on emacsver.tex. Add "." to TEXINPUTS for TeX commands. * admin/admin.el (set-version): Set major version in etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex. (set-copyright): In etc/refcards, only change ru-refcard.tex and emacsver.tex. * admin.el (cusver-scan, cusver-check): Bind local variables. * .bzrignore: Add etc/refcards TeX intermediate files. diff: === modified file '.bzrignore' --- .bzrignore 2012-09-16 18:49:00 +0000 +++ .bzrignore 2012-09-17 07:22:17 +0000 @@ -66,6 +66,8 @@ !doc/lispintro/cons-*.pdf !doc/lispintro/drawers.pdf !doc/lispintro/lambda-*.pdf +etc/refcards/*.aux +etc/refcards/*.log info/*.info admin/unidata/unidata.txt build-aux/compile === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-09-17 00:56:08 +0000 +++ admin/ChangeLog 2012-09-17 07:22:17 +0000 @@ -1,5 +1,12 @@ 2012-09-17 Glenn Morris + * admin.el (cusver-scan, cusver-check): Bind local variables. + + * admin.el (set-version): Set major version in + etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex. + (set-copyright): In etc/refcards, only change ru-refcard.tex + and emacsver.tex. + * admin.el (set-copyright): No more need to set copyrights for nextstep, or .c files. Add configure.ac and config.nt. === modified file 'admin/admin.el' --- admin/admin.el 2012-09-17 00:56:08 +0000 +++ admin/admin.el 2012-09-17 07:22:17 +0000 @@ -126,7 +126,16 @@ (set-version-in-file root "nt/emacsclient.rc" comma-space-version (rx (and "\"ProductVersion\"" (0+ space) ?, (0+ space) ?\" (submatch (1+ (in "0-9, "))) - "\\0\""))))) + "\\0\""))) + (when (string-match "\\([0-9]\\{2,\\}\\)" version) + (setq version (match-string 1 version)) + (set-version-in-file root "etc/refcards/ru-refcard.tex" version + "\\\\newcommand{\\\\versionemacs}\\[0\\]\ +{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs") + (set-version-in-file root "etc/refcards/emacsver.tex" version + "\\\\def\\\\versionemacs\ +{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")))) + ;; Note this makes some assumptions about form of short copyright. (defun set-copyright (root copyright) @@ -150,19 +159,14 @@ (set-version-in-file root "lib-src/rcs2log" copyright (rx (and "Copyright" (0+ space) ?= (0+ space) ?\' (submatch (1+ nonl))))) - ;; This one is a nuisance, as it needs to be split over two lines. - (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright) (when (string-match "\\([0-9]\\{4\\}\\)" copyright) (setq copyright (match-string 1 copyright)) - (dolist (file (directory-files (expand-file-name "etc/refcards" root) - t "\\.tex\\'")) - (unless (string-match "gnus-refcard\\.tex" file) - (set-version-in-file - root file copyright - (concat (if (string-match "ru-refcard\\.tex" file) - "\\\\newcommand{\\\\cyear}\\[0\\]{" - "\\\\def\\\\year{") - "\\([0-9]\\{4\\}\\)}.+%.+copyright year")))))) + (set-version-in-file root "etc/refcards/ru-refcard.tex" copyright + "\\\\newcommand{\\\\cyear}\\[0\\]\ +{\\([0-9]\\{4\\}\\)}.+%.+copyright year") + (set-version-in-file root "etc/refcards/emacsver.tex" copyright + "\\\\def\\\\year\ +{\\([0-9]\\{4\\}\\)}.+%.+copyright year"))) ;;; Various bits of magic for generating the web manuals @@ -443,7 +447,7 @@ (let ((m (format "Scanning %s..." file)) (re (format "^[ \t]*\\((def%s\\)[ \t\n]" (if old "\\(?:custom\\|var\\)" "custom"))) - alist var ver) + alist var ver form) (message "%s" m) (with-temp-buffer (insert-file-contents file) @@ -502,7 +506,7 @@ (mapcar (lambda (file) (cons file (cusver-scan file))) newfiles))) - oldcus result thisfile) + oldcus result thisfile file) (message "Reading old defcustoms...") (dolist (file oldfiles) (setq oldcus (append oldcus (cusver-scan file t)))) === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-09-16 21:43:55 +0000 +++ etc/ChangeLog 2012-09-17 07:22:17 +0000 @@ -1,3 +1,23 @@ +2012-09-17 Glenn Morris + + * refcards/emacsver.tex: New file. + * refcards/calccard.tex, refcards/cs-dired-ref.tex: + * refcards/cs-refcard.tex, refcards/cs-survival.tex: + * refcards/de-refcard.tex, refcards/dired-ref.tex: + * refcards/emacsver.tex, refcards/fr-dired-ref.tex: + * refcards/fr-refcard.tex, refcards/fr-survival.tex: + * refcards/orgcard.tex, refcards/pl-refcard.tex: + * refcards/pt-br-refcard.tex, refcards/refcard.tex: + * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex: + * refcards/sk-survival.tex, refcards/survival.tex: + * refcards/vipcard.tex, refcards/viperCard.tex: Include emacsver.tex. + * refcards/calccard.tex (\emacsversionnumber): + Rename to \versionemacs, same as all the other refcards. + * refcards/Makefile (ENVADD): New variable. + (sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf) + (%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi): + Depend on emacsver.tex. Add "." to TEXINPUTS for TeX commands. + 2012-09-16 Paul Eggert Remove configure's --without-sync-input option (Bug#12450). === modified file 'etc/refcards/Makefile' --- etc/refcards/Makefile 2012-01-19 07:21:25 +0000 +++ etc/refcards/Makefile 2012-09-17 07:22:17 +0000 @@ -47,26 +47,27 @@ viper-cards_pdf: ${VIPER_CARDS_PDF} viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps} +ENVADD = TEXINPUTS=".:" ## PDF files. ## The page layouts (a4/letter) are written directly in the .tex files. cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \ -sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex +sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex emacsver.tex if pdfcsplain --version > /dev/null 2> /dev/null; then \ - pdfcsplain $<; \ + ${ENVADD} pdfcsplain $<; \ else \ - csplain "\pdfoutput=1\input $<"; \ + ${ENVADD} csplain "\pdfoutput=1\input $<"; \ fi ## Some versions of pdfmex seem to create dvi by default, hence output-format. -pl-refcard.pdf: %.pdf: %.tex +pl-refcard.pdf: %.pdf: %.tex emacsver.tex if ! kpsewhich -format=fmt mex > /dev/null && \ ! pdfmex --version > /dev/null 2> /dev/null; then \ echo "No mex format found."; false; \ fi - pdftex -output-format=pdf $< + ${ENVADD} pdftex -output-format=pdf $< ru-refcard.pdf: %.pdf: %.tex pdflatex $< @@ -81,21 +82,21 @@ pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' ## Everything not explicitly listed above. -%.pdf: %.tex - pdftex $< +%.pdf: %.tex emacsver.tex + ${ENVADD} pdftex $< ## dvi files. cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \ -sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex - csplain $< +sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex emacsver.tex + ${ENVADD} csplain $< -pl-refcard.dvi: %.dvi: %.tex +pl-refcard.dvi: %.dvi: %.tex emacsver.tex if ! kpsewhich -format=fmt mex > /dev/null; then \ echo "No mex format found."; false; \ fi - tex $< + ${ENVADD} tex $< ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex latex $< @@ -105,8 +106,8 @@ mv gnus-refcard.dvi $@ ## Everything not explicitly listed above. -%.dvi: %.tex - tex $< +%.dvi: %.tex emacsver.tex + ${ENVADD} tex $< ## PostScript files. === modified file 'etc/refcards/calccard.tex' --- etc/refcards/calccard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/calccard.tex 2012-09-17 07:22:17 +0000 @@ -63,8 +63,7 @@ % UUCP: mit-erl!gildea % Internet: gildea@stop.mail-abuse.org -\def\emacsversionnumber{24} -\def\year{2012} % latest copyright year +\input emacsver.tex \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. @@ -276,7 +275,7 @@ \title{GNU Calc Reference Card} -\centerline{(for GNU Emacs version \emacsversionnumber)} +\centerline{(for GNU Emacs version \versionemacs)} \section{Starting and Stopping} === modified file 'etc/refcards/cs-dired-ref.tex' --- etc/refcards/cs-dired-ref.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/cs-dired-ref.tex 2012-09-17 07:22:17 +0000 @@ -41,8 +41,7 @@ \input pdflayout.sty \pdflayout=(0) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed. === modified file 'etc/refcards/cs-refcard.tex' --- etc/refcards/cs-refcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/cs-refcard.tex 2012-09-17 07:22:17 +0000 @@ -59,8 +59,7 @@ \input pdflayout.sty \pdflayout=(0) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed. === modified file 'etc/refcards/cs-survival.tex' --- etc/refcards/cs-survival.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/cs-survival.tex 2012-09-17 07:22:17 +0000 @@ -54,8 +54,7 @@ % Czech hyphenation rules applied \chyph -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/de-refcard.tex' --- etc/refcards/de-refcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/de-refcard.tex 2012-09-17 07:22:17 +0000 @@ -60,8 +60,7 @@ \input german.sty \mdqoff % deactivates the "-char -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed below this line. === modified file 'etc/refcards/dired-ref.tex' --- etc/refcards/dired-ref.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/dired-ref.tex 2012-09-17 07:22:17 +0000 @@ -43,8 +43,7 @@ \input pdflayout.sty \pdflayout=(1) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed. === added file 'etc/refcards/emacsver.tex' --- etc/refcards/emacsver.tex 1970-01-01 00:00:00 +0000 +++ etc/refcards/emacsver.tex 2012-09-17 07:22:17 +0000 @@ -0,0 +1,4 @@ +%% This file is not generated by configure, because then the provided +%% pdf files would always appear out-of-date. +\def\versionemacs{24} % major version of emacs +\def\year{2012} % latest copyright year === modified file 'etc/refcards/fr-dired-ref.tex' --- etc/refcards/fr-dired-ref.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/fr-dired-ref.tex 2012-09-17 07:22:17 +0000 @@ -35,8 +35,7 @@ \input pdflayout.sty \pdflayout=(0) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed. === modified file 'etc/refcards/fr-refcard.tex' --- etc/refcards/fr-refcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/fr-refcard.tex 2012-09-17 07:22:17 +0000 @@ -56,8 +56,7 @@ \input pdflayout.sty \pdflayout=(0l) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed below this line. === modified file 'etc/refcards/fr-survival.tex' --- etc/refcards/fr-survival.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/fr-survival.tex 2012-09-17 07:22:17 +0000 @@ -49,8 +49,7 @@ \input pdflayout.sty \pdflayout=(0) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/orgcard.tex' --- etc/refcards/orgcard.tex 2012-05-25 07:39:32 +0000 +++ etc/refcards/orgcard.tex 2012-09-17 07:22:17 +0000 @@ -1,7 +1,7 @@ % Reference Card for Org Mode \def\orgversionnumber{7.8.11} \def\versionyear{2012} % latest update -\def\year{2012} % latest copyright year +\input emacsver.tex %**start of header \newcount\columnsperpage === modified file 'etc/refcards/pl-refcard.tex' --- etc/refcards/pl-refcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/pl-refcard.tex 2012-09-17 07:22:17 +0000 @@ -69,8 +69,7 @@ \input pdflayout.sty \pdflayout=(0) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed. === modified file 'etc/refcards/pt-br-refcard.tex' --- etc/refcards/pt-br-refcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/pt-br-refcard.tex 2012-09-17 07:22:17 +0000 @@ -62,8 +62,7 @@ \input pdflayout.sty \pdflayout=(0l) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed below this line. === modified file 'etc/refcards/refcard.tex' --- etc/refcards/refcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/refcard.tex 2012-09-17 07:22:17 +0000 @@ -63,8 +63,7 @@ % Nothing else needs to be changed below this line. -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % copyright year +\input emacsver.tex \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. === modified file 'etc/refcards/sk-dired-ref.tex' --- etc/refcards/sk-dired-ref.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/sk-dired-ref.tex 2012-09-17 07:22:17 +0000 @@ -42,8 +42,7 @@ \input pdflayout.sty \pdflayout=(0) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed. === modified file 'etc/refcards/sk-refcard.tex' --- etc/refcards/sk-refcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/sk-refcard.tex 2012-09-17 07:22:17 +0000 @@ -60,8 +60,7 @@ \input pdflayout.sty \pdflayout=(0) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex % Nothing else needs to be changed. === modified file 'etc/refcards/sk-survival.tex' --- etc/refcards/sk-survival.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/sk-survival.tex 2012-09-17 07:22:17 +0000 @@ -55,8 +55,7 @@ % Slovak hyphenation rules applied \shyph -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/survival.tex' --- etc/refcards/survival.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/survival.tex 2012-09-17 07:22:17 +0000 @@ -44,8 +44,7 @@ \input pdflayout.sty \pdflayout=(1) -\def\versionemacs{24} % version of Emacs this is for -\def\year{2012} % latest copyright year +\input emacsver.tex \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/vipcard.tex' --- etc/refcards/vipcard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/vipcard.tex 2012-09-17 07:22:17 +0000 @@ -49,8 +49,8 @@ \input pdflayout.sty \pdflayout=(1) +\input emacsver.tex \def\versionemacs{18} % version of Emacs this is for -\def\year{2012} % latest copyright year \def\versionvip{3.5} % Nothing else needs to be changed. === modified file 'etc/refcards/viperCard.tex' --- etc/refcards/viperCard.tex 2012-01-19 07:21:25 +0000 +++ etc/refcards/viperCard.tex 2012-09-17 07:22:17 +0000 @@ -52,8 +52,8 @@ \input pdflayout.sty \pdflayout=(1) +\input emacsver.tex \def\versionemacs{21} % version of Emacs this is for -\def\year{2012} % latest copyright year \def\versionxemacs{20} % version of XEmacs this is for \def\versionviper{3.0} % version of Viper this is for ------------------------------------------------------------ revno: 110062 committer: Chong Yidong branch nick: trunk timestamp: Mon 2012-09-17 13:41:04 +0800 message: Update docstrings and comments to use "init file" terminology. * bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes. * comint.el (comint-prompt-read-only): * custom.el (defcustom): * hi-lock.el (hi-lock-mode): * ibuffer.el (ibuffer-formats): * ielm.el (ielm-prompt-read-only): * novice.el (disable-command): * saveplace.el (toggle-save-place): * speedbar.el (speedbar-supported-extension-expressions): * startup.el (auto-save-list-file-prefix, init-file-user) (after-init-hook, inhibit-startup-echo-area-message): * strokes.el (strokes-help): * time-stamp.el (time-stamp): * calendar/calendar.el (calendar, diary-file): * calendar/diary-lib.el (diary-mail-entries, diary) (diary-list-entries-hook): * calendar/holidays.el (holidays, calendar-holidays): * calendar/lunar.el (lunar-phases): * calendar/solar.el (sunrise-sunset): * emulation/edt.el (edt-load-keys): * emulation/viper.el (viper-mode): * eshell/em-alias.el (eshell-command-aliases-list): * eshell/esh-util.el (eshell-convert-numeric-arguments): * international/ogonek.el (ogonek-information): * net/tramp-cmds.el (tramp-bug): * net/quickurl.el (quickurl-reread-hook-postfix): * play/decipher.el (decipher-font-lock-keywords): * progmodes/cc-styles.el (c-set-style): * progmodes/idlw-shell.el (idlwave-shell-prompt-pattern): * progmodes/inf-lisp.el (inferior-lisp-prompt): * progmodes/octave-mod.el (octave-mode): * progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password): * progmodes/verilog-mode.el (verilog-read-defines): * textmodes/two-column.el (2C-mode): Likewise. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-17 05:01:10 +0000 +++ lisp/ChangeLog 2012-09-17 05:41:04 +0000 @@ -4,6 +4,41 @@ (shell-dynamic-complete-functions): Convert to defcustom. (shell-prompt-pattern, shell-completion-fignore): Doc fix. + * bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes. + * comint.el (comint-prompt-read-only): + * custom.el (defcustom): + * hi-lock.el (hi-lock-mode): + * ibuffer.el (ibuffer-formats): + * ielm.el (ielm-prompt-read-only): + * novice.el (disable-command): + * saveplace.el (toggle-save-place): + * speedbar.el (speedbar-supported-extension-expressions): + * startup.el (auto-save-list-file-prefix, init-file-user) + (after-init-hook, inhibit-startup-echo-area-message): + * strokes.el (strokes-help): + * time-stamp.el (time-stamp): + * calendar/calendar.el (calendar, diary-file): + * calendar/diary-lib.el (diary-mail-entries, diary) + (diary-list-entries-hook): + * calendar/holidays.el (holidays, calendar-holidays): + * calendar/lunar.el (lunar-phases): + * calendar/solar.el (sunrise-sunset): + * emulation/edt.el (edt-load-keys): + * emulation/viper.el (viper-mode): + * eshell/em-alias.el (eshell-command-aliases-list): + * eshell/esh-util.el (eshell-convert-numeric-arguments): + * international/ogonek.el (ogonek-information): + * net/tramp-cmds.el (tramp-bug): + * net/quickurl.el (quickurl-reread-hook-postfix): + * play/decipher.el (decipher-font-lock-keywords): + * progmodes/cc-styles.el (c-set-style): + * progmodes/idlw-shell.el (idlwave-shell-prompt-pattern): + * progmodes/inf-lisp.el (inferior-lisp-prompt): + * progmodes/octave-mod.el (octave-mode): + * progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password): + * progmodes/verilog-mode.el (verilog-read-defines): + * textmodes/two-column.el (2C-mode): Likewise. + 2012-09-16 Katsumi Yamaoka * mail/mailabbrev.el (mail-abbrev-expand-hook): Work for a mail aliasee === modified file 'lisp/align.el' --- lisp/align.el 2012-09-16 16:27:20 +0000 +++ lisp/align.el 2012-09-17 05:41:04 +0000 @@ -74,7 +74,7 @@ ;; align-?-modes variables (for example, `align-dq-string-modes'), use ;; `add-to-list', or some similar function which checks first to see ;; if the value is already there. Since the user may customize that -;; mode list, and then write your mode name into their .emacs file, +;; mode list, and then write your mode name into their init file, ;; causing the symbol already to be present the next time they load ;; your package. === modified file 'lisp/autoinsert.el' --- lisp/autoinsert.el 2012-06-26 16:23:01 +0000 +++ lisp/autoinsert.el 2012-09-17 05:41:04 +0000 @@ -36,7 +36,7 @@ ;; setq auto-insert-directory to an appropriate slash-terminated value ;; ;; You can also customize the variable `auto-insert-mode' to load the -;; package. Alternatively, add the following to your .emacs file: +;; package. Alternatively, add the following to your init file: ;; (auto-insert-mode 1) ;; ;; Author: Charlie Martin === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2012-08-08 08:48:57 +0000 +++ lisp/bookmark.el 2012-09-17 05:41:04 +0000 @@ -144,10 +144,7 @@ (defcustom bookmark-bmenu-toggle-filenames t "Non-nil means show filenames when listing bookmarks. -This may result in truncated bookmark names. To disable this, put the -following in your `.emacs' file: - -\(setq bookmark-bmenu-toggle-filenames nil)" +A non-nil value may result in truncated bookmark names." :type 'boolean :group 'bookmark) === modified file 'lisp/calc/calc-ext.el' --- lisp/calc/calc-ext.el 2012-09-13 18:41:21 +0000 +++ lisp/calc/calc-ext.el 2012-09-17 05:41:04 +0000 @@ -3483,7 +3483,7 @@ (substring str i)))) str)) -;;; Users can redefine this in their .emacs files. +;;; Users can redefine this in their init files. (defvar calc-keypad-user-menu nil "If non-nil, this describes an additional menu for calc-keypad. It should contain a list of three rows. === modified file 'lisp/calc/calc-forms.el' --- lisp/calc/calc-forms.el 2012-05-04 06:13:18 +0000 +++ lisp/calc/calc-forms.el 2012-09-17 05:41:04 +0000 @@ -494,7 +494,7 @@ (car res)))))))) -;;; It is safe to redefine these in your .emacs file to use a different +;;; It is safe to redefine these in your init file to use a different ;;; language. (defvar math-long-weekday-names '( "Sunday" "Monday" "Tuesday" "Wednesday" === modified file 'lisp/calendar/calendar.el' --- lisp/calendar/calendar.el 2012-06-26 07:13:40 +0000 +++ lisp/calendar/calendar.el 2012-09-17 05:41:04 +0000 @@ -593,7 +593,7 @@ Three default styles are provided: `diary-american-date-forms', `diary-european-date-forms', and `diary-iso-date-forms'. You can choose between these by setting `calendar-date-style' in your -.emacs file, or by using `calendar-set-date-style' when in the calendar. +init file, or by using `calendar-set-date-style' when in the calendar. A diary entry can be preceded by the character `diary-nonmarking-symbol' \(ordinarily `&') to make that entry nonmarking--that is, it will not be @@ -1276,7 +1276,7 @@ generating a calendar, if today's date is visible or not, respectively `calendar-initial-window-hook' - after first creating a calendar -This function is suitable for execution in a .emacs file." +This function is suitable for execution in an init file." (interactive "P") ;; Avoid loading cal-x unless it will be used. (if (and (memq calendar-setup '(one-frame two-frames calendar-only)) === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2012-08-20 18:13:03 +0000 +++ lisp/calendar/diary-lib.el 2012-09-17 05:41:04 +0000 @@ -200,19 +200,21 @@ 'diary-list-entries-hook "23.1") (defcustom diary-list-entries-hook nil - "List of functions called after diary file is culled for relevant entries. -You might wish to add `diary-include-other-diary-files', in which case -you will probably also want to add `diary-mark-included-diary-files' to -`diary-mark-entries-hook'. For example, you could use + "Hook run after diary file is culled for relevant entries. + +If you add `diary-include-other-diary-files' to this hook, you +will probably also want to add `diary-mark-included-diary-files' +to `diary-mark-entries-hook'. For example, to cause the fancy +diary buffer to be displayed with diary entries from various +included files, each day's entries sorted into lexicographic +order, add the following to your init file: (setq diary-display-function 'diary-fancy-display) (add-hook 'diary-list-entries-hook 'diary-include-other-diary-files) (add-hook 'diary-list-entries-hook 'diary-sort-entries t) -in your `.emacs' file to cause the fancy diary buffer to be displayed with -diary entries from various included files, each day's entries sorted into -lexicographic order. Note how the sort function is placed last, -so that it can sort the entries included from other files. +Note how the sort function is placed last, so that it can sort +the entries included from other files. This hook runs after `diary-nongregorian-listing-hook'. These two hooks differ only if you are using included diary files. In that case, @@ -532,7 +534,7 @@ "Generate the diary window for ARG days starting with the current date. If no argument is provided, the number of days of diary entries is governed by the variable `diary-number-of-entries'. A value of ARG less than 1 -does nothing. This function is suitable for execution in a `.emacs' file." +does nothing. This function is suitable for execution in an init file." (interactive "P") (diary-check-diary-file) (diary-list-entries (calendar-current-date) @@ -1230,8 +1232,8 @@ Here is an example of a script to call `diary-mail-entries', suitable for regular scheduling using cron (or at). Note that -since `emacs -script' does not load your `.emacs' file, you -should ensure that all relevant variables are set. +since `emacs -script' does not load your init file, you should +ensure that all relevant variables are set. #!/usr/bin/emacs -script ;; diary-rem.el - run the Emacs diary-reminder === modified file 'lisp/calendar/holidays.el' --- lisp/calendar/holidays.el 2012-09-05 07:05:56 +0000 +++ lisp/calendar/holidays.el 2012-09-17 05:41:04 +0000 @@ -343,12 +343,12 @@ "List of notable days for the command \\[holidays]. Additional holidays are easy to add to the list, just put them in the -list `holiday-other-holidays' in your .emacs file. Similarly, by setting +list `holiday-other-holidays' in your init file. Similarly, by setting any of `holiday-general-holidays', `holiday-local-holidays', `holiday-christian-holidays', `holiday-hebrew-holidays', `holiday-islamic-holidays', `holiday-bahai-holidays', `holiday-oriental-holidays', or `holiday-solar-holidays' to nil in your -.emacs file, you can eliminate unwanted categories of holidays. +init file, you can eliminate unwanted categories of holidays. The aforementioned variables control the holiday choices offered by the function `holiday-list' when it is called interactively. @@ -523,7 +523,7 @@ (defun holidays (&optional arg) "Display the holidays for last month, this month, and next month. If called with an optional prefix argument ARG, prompts for month and year. -This function is suitable for execution in a .emacs file." +This function is suitable for execution in a init file." (interactive "P") (save-excursion (let* ((completion-ignore-case t) === modified file 'lisp/calendar/lunar.el' --- lisp/calendar/lunar.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/lunar.el 2012-09-17 05:41:04 +0000 @@ -236,7 +236,7 @@ (defun lunar-phases (&optional arg) "Display the quarters of the moon for last month, this month, and next month. If called with an optional prefix argument ARG, prompts for month and year. -This function is suitable for execution in a .emacs file." +This function is suitable for execution in an init file." (interactive "P") (save-excursion (let* ((date (if arg (calendar-read-date t) === modified file 'lisp/calendar/solar.el' --- lisp/calendar/solar.el 2012-01-19 07:21:25 +0000 +++ lisp/calendar/solar.el 2012-09-17 05:41:04 +0000 @@ -797,7 +797,7 @@ If called with an optional double prefix argument, prompt for longitude, latitude, time zone, and date, and always use standard time. -This function is suitable for execution in a .emacs file." +This function is suitable for execution in an init file." (interactive "p") (or arg (setq arg 1)) (if (and (< arg 16) === modified file 'lisp/calendar/timeclock.el' --- lisp/calendar/timeclock.el 2012-08-15 16:29:11 +0000 +++ lisp/calendar/timeclock.el 2012-09-17 05:41:04 +0000 @@ -49,7 +49,7 @@ ;; If you want Emacs to display the amount of time "left" to your ;; workday in the mode-line, you can either set the value of ;; `timeclock-mode-line-display' to t using M-x customize, or you can -;; add this code to your .emacs file: +;; add this code to your init file: ;; ;; (require 'timeclock) ;; (timeclock-mode-line-display) @@ -60,7 +60,7 @@ ;; You may also want Emacs to ask you before exiting, if you are ;; currently working on a project. This can be done either by setting ;; `timeclock-ask-before-exiting' to t using M-x customize (this is -;; the default), or by adding the following to your .emacs file: +;; the default), or by adding the following to your init file: ;; ;; (add-hook 'kill-emacs-query-functions 'timeclock-query-out) === modified file 'lisp/comint.el' --- lisp/comint.el 2012-08-15 16:29:11 +0000 +++ lisp/comint.el 2012-09-17 05:41:04 +0000 @@ -181,7 +181,7 @@ `comint-kill-whole-line' or `comint-kill-region' with no narrowing in effect. This way you will be certain that none of the remaining prompts will be accidentally messed up. You may -wish to put something like the following in your `.emacs' file: +wish to put something like the following in your init file: \(add-hook 'comint-mode-hook (lambda () === modified file 'lisp/custom.el' --- lisp/custom.el 2012-09-10 15:52:15 +0000 +++ lisp/custom.el 2012-09-17 05:41:04 +0000 @@ -237,7 +237,7 @@ is `default-value'. :require VALUE should be a feature symbol. If you save a value - for this option, then when your `.emacs' file loads the value, + for this option, then when your init file loads the value, it does (require VALUE) first. :set-after VARIABLES Specifies that SYMBOL should be set after the list of variables === modified file 'lisp/desktop.el' --- lisp/desktop.el 2012-07-26 01:27:33 +0000 +++ lisp/desktop.el 2012-09-17 05:41:04 +0000 @@ -34,7 +34,7 @@ ;; - some local variables ;; To use this, use customize to turn on desktop-save-mode or add the -;; following line somewhere in your .emacs file: +;; following line somewhere in your init file: ;; ;; (desktop-save-mode 1) ;; === modified file 'lisp/emacs-lisp/byte-run.el' --- lisp/emacs-lisp/byte-run.el 2012-09-07 20:14:55 +0000 +++ lisp/emacs-lisp/byte-run.el 2012-09-17 05:41:04 +0000 @@ -312,7 +312,7 @@ See the Info node `(elisp)Variable Aliases' for more details. If CURRENT-NAME is a defcustom (more generally, any variable -where OBSOLETE-NAME may be set, e.g. in a .emacs file, before the +where OBSOLETE-NAME may be set, e.g. in an init file, before the alias is defined), then the define-obsolete-variable-alias statement should be evaluated before the defcustom, if user customizations are to be respected. The simplest way to achieve === modified file 'lisp/emacs-lisp/cl-lib.el' --- lisp/emacs-lisp/cl-lib.el 2012-08-28 20:14:21 +0000 +++ lisp/emacs-lisp/cl-lib.el 2012-09-17 05:41:04 +0000 @@ -121,7 +121,7 @@ ;;; Generalized variables. ;; These macros are defined here so that they -;; can safely be used in .emacs files. +;; can safely be used in init files. (defmacro cl-incf (place &optional x) "Increment PLACE by X (1 by default). === modified file 'lisp/emulation/edt-mapper.el' --- lisp/emulation/edt-mapper.el 2012-01-19 07:21:25 +0000 +++ lisp/emulation/edt-mapper.el 2012-09-17 05:41:04 +0000 @@ -61,7 +61,7 @@ ;; emacs -q -l edt-mapper.el -;; The "-q" option prevents loading of your .emacs file (commands +;; The "-q" option prevents loading of your init file (commands ;; therein might confuse this program). ;; An instruction screen showing the typical LK-201 terminal @@ -74,7 +74,7 @@ ;; and loaded automatically when the EDT emulation is started. If ;; you specify a different file name, you will need to set the ;; variable "edt-keys-file" before starting the EDT emulation. -;; Here's how you might go about doing that in your .emacs file. +;; Here's how you might go about doing that in your init file: ;; (setq edt-keys-file (expand-file-name "~/.my-emacs-keys")) === modified file 'lisp/emulation/edt.el' --- lisp/emulation/edt.el 2012-06-19 07:05:44 +0000 +++ lisp/emulation/edt.el 2012-09-17 05:41:04 +0000 @@ -48,7 +48,7 @@ ;; You can have the EDT Emulation start up automatically, each time ;; you initiate a GNU Emacs session, by adding the following line to -;; your .emacs file: +;; your init file: ;; ;; (add-hook term-setup-hook 'edt-emulation-on) @@ -75,7 +75,7 @@ ;; default, this feature is enabled, with the top margin set to ;; 10% of the window and the bottom margin set to 15% of the ;; window. To change these settings, you can invoke the function -;; edt-set-scroll-margins in your .emacs file. For example, the +;; edt-set-scroll-margins in your init file. For example, the ;; following line ;; ;; (edt-set-scroll-margins "20%" "25%") @@ -363,7 +363,7 @@ ;;; ;;; (setq edt-keep-current-page-delimiter t) ;;; -;;; in your .emacs file. +;;; in your init file. (defun edt-page-forward (num) "Move forward to just after next page delimiter. @@ -1961,14 +1961,14 @@ Ack!! You're running the Enhanced EDT Emulation without loading an EDT key mapping file. To create an EDT key mapping file, run the edt-mapper program. It is safest to run it from an Emacs loaded - without any of your own customizations found in your .emacs file, etc. + without any of your own customizations found in your init file, etc. The reason for this is that some user customizations confuse edt-mapper. You can do this by quitting Emacs and then invoking Emacs again as follows: emacs -q -l edt-mapper - [NOTE: If you do nothing out of the ordinary in your .emacs file, and + [NOTE: If you do nothing out of the ordinary in your init file, and the search for edt-mapper is successful, you can try running it now.] The library edt-mapper includes these same directions on how to === modified file 'lisp/emulation/tpu-edt.el' --- lisp/emulation/tpu-edt.el 2012-05-13 03:05:06 +0000 +++ lisp/emulation/tpu-edt.el 2012-09-17 05:41:04 +0000 @@ -163,8 +163,8 @@ ;; and type `tpu-edt' followed by a carriage return. ;; If you like TPU-edt and want to use it all the time, you can start -;; TPU-edt using the Emacs initialization file, .emacs. Simply create -;; a .emacs file in your home directory containing the line: +;; TPU-edt using the Emacs initialization file, .emacs. Simply add +;; the following line to your init file: ;; (tpu-edt) @@ -2440,7 +2440,7 @@ ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins -;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "76f06905db4c5bfb3b86491a51512a0e") +;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "bf5e7322f9a2c324a3bb306415813374") ;;; Generated autoloads from tpu-extras.el (autoload 'tpu-cursor-free-mode "tpu-extras" "\ === modified file 'lisp/emulation/tpu-extras.el' --- lisp/emulation/tpu-extras.el 2012-02-08 02:12:24 +0000 +++ lisp/emulation/tpu-extras.el 2012-09-17 05:41:04 +0000 @@ -26,7 +26,7 @@ ;; Use the functions defined here to customize TPU-edt to your tastes by ;; setting scroll margins and/or turning on free cursor mode. Here's an -;; example for your .emacs file. +;; example for your init file. ;; (tpu-set-cursor-free) ; Set cursor free. ;; (tpu-set-scroll-margins "10%" "15%") ; Set scroll margins. === modified file 'lisp/emulation/tpu-mapper.el' --- lisp/emulation/tpu-mapper.el 2012-01-19 07:21:25 +0000 +++ lisp/emulation/tpu-mapper.el 2012-09-17 05:41:04 +0000 @@ -81,7 +81,7 @@ definitions. If you chose the default, TPU-edt will find it and load it automatically. If you specify a different file name, you will need to set the variable ``tpu-xkeys-file'' before starting TPU-edt. Here's how -you might go about doing that in your .emacs file. +you might go about doing that in your init file. (setq tpu-xkeys-file (expand-file-name \"~/.my-emacs-x-keys\")) (tpu-edt) === modified file 'lisp/emulation/vi.el' --- lisp/emulation/vi.el 2011-10-01 20:32:01 +0000 +++ lisp/emulation/vi.el 2012-09-17 05:41:04 +0000 @@ -28,7 +28,7 @@ ;; (if (not (or (eq major-mode 'Info-mode) ;; (eq major-mode 'vi-mode))) ;; (vi-mode)))))) -;; 3) In your .emacs file you can define the command "vi-mode" to be "autoload" +;; 3) In your init file you can define the command "vi-mode" to be "autoload" ;; or you can execute the "load" command to load "vi" directly. ;; 4) Read the comments for command "vi-mode" before you start using it. === modified file 'lisp/emulation/viper.el' --- lisp/emulation/viper.el 2012-07-29 07:16:45 +0000 +++ lisp/emulation/viper.el 2012-09-17 05:41:04 +0000 @@ -351,7 +351,7 @@ If t, viperize Emacs. If nil -- don't. If `ask', ask the user. This variable is used primarily when Viper is being loaded. -Must be set in `~/.emacs' before Viper is loaded. +Must be set in your init file before Viper is loaded. DO NOT set this variable interactively, unless you are using the customization widget." :type '(choice (const nil) (const t) (const ask)) @@ -1173,7 +1173,7 @@ (setq viper-mode t) (require 'viper) -in your .emacs file (preferably, close to the top). +in your init file (preferably, close to the top). These two lines must come in the order given. ** Viper users: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-08-28 16:01:59 +0000 +++ lisp/erc/ChangeLog 2012-09-17 05:41:04 +0000 @@ -1,3 +1,9 @@ +2012-09-17 Chong Yidong + + * erc-page.el (erc-page-function): + + * erc-stamp.el (erc-stamp): Doc fix. + 2012-08-21 Josh Feinstein * erc-join.el (erc-autojoin-timing): Fix defcustom type. === modified file 'lisp/erc/erc-button.el' --- lisp/erc/erc-button.el 2012-06-08 16:39:49 +0000 +++ lisp/erc/erc-button.el 2012-09-17 05:41:04 +0000 @@ -25,7 +25,7 @@ ;; Heavily borrowed from gnus-art.el. Thanks to the original authors. ;; This buttonizes nicks and other stuff to make it all clickable. -;; To enable, add to your ~/.emacs: +;; To enable, add to your init file: ;; (require 'erc-button) ;; (erc-button-mode 1) ;; === modified file 'lisp/erc/erc-capab.el' --- lisp/erc/erc-capab.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-capab.el 2012-09-17 05:41:04 +0000 @@ -48,7 +48,7 @@ ;;; Usage: -;; Put the following in your ~/.emacs file. +;; Put the following in your init file. ;; (require 'erc-capab) ;; (erc-capab-identify-mode 1) === modified file 'lisp/erc/erc-match.el' --- lisp/erc/erc-match.el 2012-08-21 07:52:42 +0000 +++ lisp/erc/erc-match.el 2012-09-17 05:41:04 +0000 @@ -29,7 +29,7 @@ ;; customizable variables. ;; Usage: -;; Put (erc-match-mode 1) into your ~/.emacs file. +;; Put (erc-match-mode 1) into your init file. ;;; Code: === modified file 'lisp/erc/erc-netsplit.el' --- lisp/erc/erc-netsplit.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-netsplit.el 2012-09-17 05:41:04 +0000 @@ -23,7 +23,7 @@ ;;; Commentary: ;; This module hides quit/join messages if a netsplit occurs. -;; To enable, add the following to your ~/.emacs: +;; To enable, add the following to your init file: ;; (require 'erc-netsplit) ;; (erc-netsplit-mode 1) === modified file 'lisp/erc/erc-page.el' --- lisp/erc/erc-page.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-page.el 2012-09-17 05:41:04 +0000 @@ -45,7 +45,7 @@ `beep'. If non-nil, it must be a function that takes two arguments: SENDER and MSG, both strings. -Example for your ~/.emacs file: +Example for your init file: \(setq erc-page-function (lambda (sender msg) === modified file 'lisp/erc/erc-replace.el' --- lisp/erc/erc-replace.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-replace.el 2012-09-17 05:41:04 +0000 @@ -25,7 +25,7 @@ ;; This module allows you to systematically replace text in incoming ;; messages. Load erc-replace, and customize `erc-replace-alist'. -;; Then add to your ~/.emacs: +;; Then add to your init file: ;; (require 'erc-replace) ;; (erc-replace-mode 1) === modified file 'lisp/erc/erc-stamp.el' --- lisp/erc/erc-stamp.el 2012-06-08 16:39:49 +0000 +++ lisp/erc/erc-stamp.el 2012-09-17 05:41:04 +0000 @@ -43,7 +43,7 @@ of timestamp information in `erc-mode' buffer. For timestamping to be activated, you just need to load `erc-stamp' -in your .emacs file or interactively using `load-library'." +in your init file or interactively using `load-library'." :group 'erc) (defcustom erc-timestamp-format "[%H:%M]" === modified file 'lisp/erc/erc-track.el' --- lisp/erc/erc-track.el 2012-06-02 10:56:09 +0000 +++ lisp/erc/erc-track.el 2012-09-17 05:41:04 +0000 @@ -24,7 +24,7 @@ ;;; Commentary: ;; Highlights keywords and pals (friends), and hides or highlights fools -;; (using a dark color). Add to your ~/.emacs: +;; (using a dark color). Add to your init file: ;; (require 'erc-track) ;; (erc-track-mode 1) === modified file 'lisp/eshell/em-alias.el' --- lisp/eshell/em-alias.el 2012-06-27 07:08:06 +0000 +++ lisp/eshell/em-alias.el 2012-09-17 05:41:04 +0000 @@ -133,10 +133,10 @@ Where NAME is the textual name of the alias, and DEFINITION is the command string to replace that command with. -Note: this list should not be modified in your '.emacs' file. Rather, -any desired alias definitions should be declared using the `alias' -command, which will automatically write them to the file named by -`eshell-aliases-file'.") +Note: this list should not be modified in your init file. +Rather, any desired alias definitions should be declared using +the `alias' command, which will automatically write them to the +file named by `eshell-aliases-file'.") (put 'eshell-command-aliases-list 'risky-local-variable t) === modified file 'lisp/eshell/esh-util.el' --- lisp/eshell/esh-util.el 2012-01-23 08:12:10 +0000 +++ lisp/eshell/esh-util.el 2012-09-17 05:41:04 +0000 @@ -84,7 +84,7 @@ NOTE: If you find that numeric conversions are interfering with the specification of filenames (for example, in calling `find-file', or some other Lisp function that deals with files, not numbers), add the -following in your .emacs file: +following in your init file: (put 'find-file 'eshell-no-numeric-conversions t) === modified file 'lisp/ffap.el' --- lisp/ffap.el 2012-08-29 15:11:51 +0000 +++ lisp/ffap.el 2012-09-17 05:41:04 +0000 @@ -34,7 +34,7 @@ ;; README's, MANIFEST's, and so on. Submit bugs or suggestions with ;; M-x ffap-bug. ;; -;; For the default installation, add this line to your .emacs file: +;; For the default installation, add this line to your init file: ;; ;; (ffap-bindings) ; do default key bindings ;; @@ -206,7 +206,7 @@ ;; those features interesting but not clear winners (a matter of ;; personal taste) I try to leave options to enable them. Read ;; through this section for features that you like, put an appropriate -;; enabler in your .emacs file. +;; enabler in your init file. (defcustom ffap-dired-wildcards "[*?][^/]*\\'" "A regexp matching filename wildcard characters, or nil. === modified file 'lisp/filesets.el' --- lisp/filesets.el 2012-07-10 11:51:54 +0000 +++ lisp/filesets.el 2012-09-17 05:41:04 +0000 @@ -35,7 +35,7 @@ ;; inclusion group (i.e. a base file including other files). ;; Usage: -;; 1. Put (require 'filesets) and (filesets-init) in your .emacs file. +;; 1. Put (require 'filesets) and (filesets-init) in your init file. ;; 2. Type ;; M-x filesets-edit or choose "Edit Filesets" from the menu. ;; 3. Save your customizations. === modified file 'lisp/flow-ctrl.el' --- lisp/flow-ctrl.el 2012-01-19 07:21:25 +0000 +++ lisp/flow-ctrl.el 2012-09-17 05:41:04 +0000 @@ -31,7 +31,7 @@ ;; ;; To invoke these adjustments, a user need only invoke the function ;; enable-flow-control-on with a list of terminal types in his/her own -;; .emacs file. As arguments, give it the names of one or more terminal +;; init file. As arguments, give it the names of one or more terminal ;; types in use by that user which require flow control adjustments. ;; Here's an example: ;; === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2012-08-20 07:30:40 +0000 +++ lisp/font-lock.el 2012-09-17 05:41:04 +0000 @@ -37,7 +37,7 @@ ;; When this minor mode is on, the faces of the current line are updated with ;; every insertion or deletion. ;; -;; To turn Font Lock mode on automatically, add this to your ~/.emacs file: +;; To turn Font Lock mode on automatically, add this to your init file: ;; ;; (add-hook 'emacs-lisp-mode-hook 'turn-on-font-lock) ;; === modified file 'lisp/frame.el' --- lisp/frame.el 2012-09-06 09:29:32 +0000 +++ lisp/frame.el 2012-09-17 05:41:04 +0000 @@ -301,7 +301,7 @@ ;; existing frame. We need to explicitly include ;; default-frame-alist in the parameters of the screen we ;; create here, so that its new value, gleaned from the user's - ;; .emacs file, will be applied to the existing screen. + ;; init file, will be applied to the existing screen. (if (not (eq (cdr (or (assq 'minibuffer initial-frame-alist) (assq 'minibuffer window-system-frame-alist) (assq 'minibuffer default-frame-alist) === modified file 'lisp/generic-x.el' --- lisp/generic-x.el 2012-01-19 07:21:25 +0000 +++ lisp/generic-x.el 2012-09-17 05:41:04 +0000 @@ -28,7 +28,7 @@ ;; ;; INSTALLATION: ;; -;; Add this line to your .emacs file: +;; Add this line to your init file: ;; ;; (require 'generic-x) ;; === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2012-08-14 06:52:59 +0000 +++ lisp/hi-lock.el 2012-09-17 05:41:04 +0000 @@ -52,14 +52,14 @@ ;; ;; Setup: ;; -;; Put the following code in your .emacs file. This turns on +;; Put the following code in your init file. This turns on ;; hi-lock mode and adds a "Regexp Highlighting" entry ;; to the edit menu. ;; ;; (global-hi-lock-mode 1) ;; ;; To enable the use of patterns found in files (presumably placed -;; there by hi-lock) include the following in your .emacs file: +;; there by hi-lock) include the following in your init file: ;; ;; (setq hi-lock-file-patterns-policy 'ask) ;; @@ -356,7 +356,7 @@ "Possible archaic use of (hi-lock-mode). Use (global-hi-lock-mode 1) in .emacs to enable hi-lock for all buffers, use (hi-lock-mode 1) for individual buffers. For compatibility with Emacs -versions before 22 use the following in your .emacs file: +versions before 22 use the following in your init file: (if (functionp 'global-hi-lock-mode) (global-hi-lock-mode 1) === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2012-08-29 15:11:51 +0000 +++ lisp/ibuffer.el 2012-09-17 05:41:04 +0000 @@ -123,13 +123,13 @@ no upper limit on its size. The size will also be aligned to the right. -Thus, if you wanted to use these two formats, add - - (setq ibuffer-formats '((mark \" \" name) - (mark modified read-only - (name 16 16 :left) (size 6 -1 :right)))) - -to your ~/.emacs file. +Thus, if you wanted to use these two formats, the appropriate +value for this variable would be + + '((mark \" \" name) + (mark modified read-only + (name 16 16 :left) + (size 6 -1 :right))) Using \\[ibuffer-switch-format], you can rotate the display between the specified formats in the list." === modified file 'lisp/ielm.el' --- lisp/ielm.el 2012-01-19 07:21:25 +0000 +++ lisp/ielm.el 2012-09-17 05:41:04 +0000 @@ -59,7 +59,7 @@ `comint-kill-whole-line' or `comint-kill-region' with no narrowing in effect. This way you will be certain that none of the remaining prompts will be accidentally messed up. You may -wish to put something like the following in your `.emacs' file: +wish to put something like the following in your init file: \(add-hook 'ielm-mode-hook (lambda () === modified file 'lisp/international/ogonek.el' --- lisp/international/ogonek.el 2012-01-19 07:21:25 +0000 +++ lisp/international/ogonek.el 2012-09-17 05:41:04 +0000 @@ -224,13 +224,14 @@ ogonek-prefix-to-encoding iso8859-2 The above default values can be changed by placing appropriate settings - in the '~/.emacs' file: + in your init file: (setq ogonek-prefix-char ?/) (setq ogonek-prefix-to-encoding \"iso8859-2\") - Instead of loading the whole library `ogonek' it may be better to - autoload the needed functions, for example by placing in `~/.emacs': + Instead of loading the whole library `ogonek' it may be better + to autoload the needed functions, for example by adding the + following lines to your init file: (autoload 'ogonek-how \"ogonek\") (autoload 'ogonek-recode-region \"ogonek\") === modified file 'lisp/locate.el' --- lisp/locate.el 2012-01-19 07:21:25 +0000 +++ lisp/locate.el 2012-09-17 05:41:04 +0000 @@ -34,7 +34,7 @@ ;; ;; SHELLPROGRAM Name-to-find ;; -;; set the variable `locate-command' in your .emacs file. +;; set the variable `locate-command' in your init file. ;; ;; To use a more complicated expression, create a function which ;; takes a string (the name to find) as input and returns a list. === modified file 'lisp/mail/feedmail.el' --- lisp/mail/feedmail.el 2012-07-29 08:18:29 +0000 +++ lisp/mail/feedmail.el 2012-09-17 05:41:04 +0000 @@ -139,9 +139,8 @@ ;; feedmail-send-it. Hers's the best way to use the stuff in this ;; file: ;; -;; Save this file as feedmail.el somewhere on your elisp -;; loadpath; byte-compile it. Put the following lines somewhere in -;; your ~/.emacs stuff: +;; Save this file as feedmail.el somewhere on your elisp loadpath; +;; byte-compile it. Put the following lines in your init file: ;; ;; (setq send-mail-function 'feedmail-send-it) ;; (autoload 'feedmail-send-it "feedmail") === modified file 'lisp/mail/mail-hist.el' --- lisp/mail/mail-hist.el 2012-04-09 13:05:48 +0000 +++ lisp/mail/mail-hist.el 2012-09-17 05:41:04 +0000 @@ -28,7 +28,7 @@ ;; time. ;; ;; To use this package, put it in a directory in your load-path, and -;; put this in your .emacs file: +;; put this in your init file: ;; ;; (load "mail-hist" nil t) ;; === modified file 'lisp/mail/uce.el' --- lisp/mail/uce.el 2012-01-19 07:21:25 +0000 +++ lisp/mail/uce.el 2012-09-17 05:41:04 +0000 @@ -63,7 +63,7 @@ ;; Usage: ;; Place uce.el in your load-path (and optionally byte-compile it). -;; Add the following line to your ~/.emacs: +;; Add the following line to your init file: ;; (autoload 'uce-reply-to-uce "uce" "Reply to UCEs" t nil) ;; If you want to use it with Gnus rather than Rmail: ;; (setq uce-mail-reader 'gnus) === modified file 'lisp/mouse-copy.el' --- lisp/mouse-copy.el 2012-01-19 07:21:25 +0000 +++ lisp/mouse-copy.el 2012-09-17 05:41:04 +0000 @@ -35,7 +35,7 @@ ;; If you like mouse-copy, you should also check out mouse-drag ;; for ``one-click scrolling''. ;; -;; To use mouse-copy, place the following in your .emacs file: +;; To use mouse-copy, place the following in your init file: ;; (require 'mouse-copy) ;; (global-set-key [M-down-mouse-1] 'mouse-drag-secondary-pasting) ;; (global-set-key [M-S-down-mouse-1] 'mouse-drag-secondary-moving) === modified file 'lisp/mouse-drag.el' --- lisp/mouse-drag.el 2012-04-09 13:05:48 +0000 +++ lisp/mouse-drag.el 2012-09-17 05:41:04 +0000 @@ -46,7 +46,7 @@ ;; If you like mouse-drag, you should also check out mouse-copy ;; for ``one-click text copy and move''. ;; -;; To use mouse-drag, place the following in your .emacs file: +;; To use mouse-drag, place the following in your init file: ;; -either- ;; (global-set-key [down-mouse-2] 'mouse-drag-throw) ;; -or- === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2012-07-29 08:18:29 +0000 +++ lisp/net/ange-ftp.el 2012-09-17 05:41:04 +0000 @@ -79,7 +79,7 @@ ;; that this change will take effect for the current GNU Emacs session only. ;; See below for a discussion of non-UNIX hosts. If a large number of ;; machines with similar hostnames have this problem then it is easier to set -;; the value of ange-ftp-dumb-unix-host-regexp in your .emacs file. ange-ftp +;; the value of ange-ftp-dumb-unix-host-regexp in your init file. ange-ftp ;; is unable to automatically recognize dumb unix hosts. ;; File name completion: @@ -275,10 +275,10 @@ ;; VMS support: ;; -;; Ange-ftp has full support for VMS hosts. It -;; should be able to automatically recognize any VMS machine. However, if it -;; fails to do this, you can use the command ange-ftp-add-vms-host. As well, -;; you can set the variable ange-ftp-vms-host-regexp in your .emacs file. We +;; Ange-ftp has full support for VMS hosts. It should be able to +;; automatically recognize any VMS machine. However, if it fails to do +;; this, you can use the command ange-ftp-add-vms-host. Also, you can +;; set the variable ange-ftp-vms-host-regexp in your init file. We ;; would be grateful if you would report any failures to automatically ;; recognize a VMS host as a bug. ;; @@ -332,7 +332,7 @@ ;; the Michigan terminal system. It should be able to automatically ;; recognize any MTS machine. However, if it fails to do this, you can use ;; the command ange-ftp-add-mts-host. As well, you can set the variable -;; ange-ftp-mts-host-regexp in your .emacs file. We would be grateful if you +;; ange-ftp-mts-host-regexp in your init file. We would be grateful if you ;; would report any failures to automatically recognize a MTS host as a bug. ;; ;; Filename syntax: @@ -358,7 +358,7 @@ ;; CMS. It should be able to automatically recognize any CMS machine. ;; However, if it fails to do this, you can use the command ;; ange-ftp-add-cms-host. As well, you can set the variable -;; ange-ftp-cms-host-regexp in your .emacs file. We would be grateful if you +;; ange-ftp-cms-host-regexp in your init file. We would be grateful if you ;; would report any failures to automatically recognize a CMS host as a bug. ;; ;; Filename syntax: === modified file 'lisp/net/browse-url.el' --- lisp/net/browse-url.el 2012-09-07 08:58:31 +0000 +++ lisp/net/browse-url.el 2012-09-17 05:41:04 +0000 @@ -122,8 +122,7 @@ ;; the buffer, use: ;; M-x browse-url -;; To display a URL by shift-clicking on it, put this in your ~/.emacs -;; file: +;; To display a URL by shift-clicking on it, put this in your init file: ;; (global-set-key [S-mouse-2] 'browse-url-at-mouse) ;; (Note that using Shift-mouse-1 is not desirable because ;; that event has a standard meaning in Emacs.) === modified file 'lisp/net/goto-addr.el' --- lisp/net/goto-addr.el 2012-04-09 13:05:48 +0000 +++ lisp/net/goto-addr.el 2012-09-17 05:41:04 +0000 @@ -33,7 +33,7 @@ ;; INSTALLATION ;; ;; To use goto-address in a particular mode (for example, while -;; reading mail in mh-e), add something like this in your .emacs file: +;; reading mail in mh-e), add this to your init file: ;; ;; (add-hook 'mh-show-mode-hook 'goto-address) ;; === modified file 'lisp/net/newsticker.el' --- lisp/net/newsticker.el 2012-06-02 10:56:09 +0000 +++ lisp/net/newsticker.el 2012-09-17 05:41:04 +0000 @@ -87,7 +87,7 @@ ;; If you are using Newsticker as part of GNU Emacs there is no need to ;; perform any installation steps in order to use Newsticker. Otherwise ;; place Newsticker in a directory where Emacs can find it. Add the -;; following line to your Emacs startup file (`~/.emacs'). +;; following line to your init file: ;; (add-to-list 'load-path "/path/to/newsticker/") ;; (autoload 'newsticker-start "newsticker" "Emacs Newsticker" t) ;; (autoload 'newsticker-show-news "newsticker" "Emacs Newsticker" t) === modified file 'lisp/net/quickurl.el' --- lisp/net/quickurl.el 2012-07-11 23:13:41 +0000 +++ lisp/net/quickurl.el 2012-09-17 05:41:04 +0000 @@ -164,7 +164,7 @@ (setq quickurl-postfix quickurl-reread-hook-postfix) -in your ~/.emacs (after loading/requiring quickurl).") +in your init file (after loading/requiring quickurl).") ;; Non-customize variables. === modified file 'lisp/net/tramp-cmds.el' --- lisp/net/tramp-cmds.el 2012-07-05 06:57:57 +0000 +++ lisp/net/tramp-cmds.el 2012-09-17 05:41:04 +0000 @@ -204,7 +204,7 @@ (setq tramp-verbose 9) -in the ~/.emacs file and to repeat the bug. Then, include the +in your init file and to repeat the bug. Then, include the contents of the *tramp/foo* buffer and the *debug tramp/foo* buffer in your bug report. === modified file 'lisp/net/webjump.el' --- lisp/net/webjump.el 2012-04-09 13:05:48 +0000 +++ lisp/net/webjump.el 2012-09-17 05:41:04 +0000 @@ -38,7 +38,7 @@ ;; example sites. You'll probably want to override it with your own favorite ;; sites. The documentation for the variable describes the syntax. -;; You may wish to add something like the following to your `.emacs' file: +;; You may wish to add something like the following to your init file: ;; ;; (require 'webjump) ;; (global-set-key "\C-cj" 'webjump) === modified file 'lisp/novice.el' --- lisp/novice.el 2012-07-11 23:13:41 +0000 +++ lisp/novice.el 2012-09-17 05:41:04 +0000 @@ -159,8 +159,8 @@ (defun disable-command (command) "Require special confirmation to execute COMMAND from now on. COMMAND must be a symbol. -This command alters the user's .emacs file so that this will apply -to future sessions." +This command alters your init file so that this choice applies to +future sessions." (interactive "CDisable command: ") (en/disable-command command t)) === modified file 'lisp/pcomplete.el' --- lisp/pcomplete.el 2012-08-15 16:29:11 +0000 +++ lisp/pcomplete.el 2012-09-17 05:41:04 +0000 @@ -28,7 +28,7 @@ ;; argument position. ;; ;; To use pcomplete with shell-mode, for example, you will need the -;; following in your .emacs file: +;; following in your init file: ;; ;; (add-hook 'shell-mode-hook 'pcomplete-shell-setup) ;; === modified file 'lisp/play/bubbles.el' --- lisp/play/bubbles.el 2012-07-11 23:13:41 +0000 +++ lisp/play/bubbles.el 2012-09-17 05:41:04 +0000 @@ -33,7 +33,7 @@ ;; Installation ;; ------------ -;; Add the following lines to your Emacs startup file (`~/.emacs'). +;; Add the following lines to your init file: ;; (add-to-list 'load-path "/path/to/bubbles/") ;; (autoload 'bubbles "bubbles" "Play Bubbles" t) === modified file 'lisp/play/decipher.el' --- lisp/play/decipher.el 2012-07-11 23:13:41 +0000 +++ lisp/play/decipher.el 2012-09-17 05:41:04 +0000 @@ -138,19 +138,7 @@ ("^)\\([A-Z ]+\\)\\([a-z ]+\\)" (1 font-lock-keyword-face) (2 font-lock-string-face))) - "Expressions to fontify in Decipher mode. - -Ciphertext uses `font-lock-keyword-face', plaintext uses -`font-lock-string-face', comments use `font-lock-comment-face', and -checkpoints use `font-lock-constant-face'. You can customize the -display by changing these variables. For best results, I recommend -that all faces use the same background color. - -For example, to display ciphertext in the `bold' face, use - (add-hook 'decipher-mode-hook - (lambda () (set (make-local-variable 'font-lock-keyword-face) - 'bold))) -in your `.emacs' file.") + "Font Lock keywords for Decipher mode.") (defvar decipher-mode-map (let ((map (make-keymap))) === modified file 'lisp/play/handwrite.el' --- lisp/play/handwrite.el 2012-02-28 08:17:21 +0000 +++ lisp/play/handwrite.el 2012-09-17 05:41:04 +0000 @@ -45,7 +45,7 @@ ;; Installation ;; ;; type at your prompt "emacs -l handwrite.el" or put this file on your -;; Emacs-Lisp load path, add the following into your ~/.emacs startup file +;; Emacs-Lisp load path, add the following into your init file: ;; ;; (require 'handwrite) ;; === modified file 'lisp/printing.el' --- lisp/printing.el 2012-07-29 08:18:29 +0000 +++ lisp/printing.el 2012-09-17 05:41:04 +0000 @@ -139,10 +139,9 @@ ;; ;; One way to set variables is by calling `pr-customize', customize all ;; variables and save the customization by future sessions (see Options -;; section). Other way is by coding your settings on Emacs init file (that is, -;; ~/.emacs file), see below for a first setting template that it should be -;; inserted on your ~/.emacs file (or c:/_emacs, if you're using Windows 9x/NT -;; or MS-DOS): +;; section). Other way is by adding code to your init file; see below +;; for a first setting template that it should be inserted on your +;; init file: ;; ;; * Example of setting for Windows system: ;; @@ -297,8 +296,7 @@ ;; Using `printing' ;; ---------------- ;; -;; To use `printing' insert in your ~/.emacs file (or c:/_emacs, if you're -;; using Windows 9x/NT or MS-DOS): +;; To use `printing' insert in your init file: ;; ;; (require 'printing) ;; ;; ...some user settings... === modified file 'lisp/progmodes/antlr-mode.el' --- lisp/progmodes/antlr-mode.el 2012-06-02 10:56:09 +0000 +++ lisp/progmodes/antlr-mode.el 2012-09-17 05:41:04 +0000 @@ -69,7 +69,7 @@ ;; This file requires Emacs-20.3, XEmacs-20.4 or higher and package cc-mode. ;; If antlr-mode is not part of your distribution, put this file into your -;; load-path and the following into your ~/.emacs: +;; load-path and the following into your init file: ;; (autoload 'antlr-mode "antlr-mode" nil t) ;; (setq auto-mode-alist (cons '("\\.g\\'" . antlr-mode) auto-mode-alist)) ;; (add-hook 'speedbar-load-hook ; would be too late in antlr-mode.el === modified file 'lisp/progmodes/cc-styles.el' --- lisp/progmodes/cc-styles.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/cc-styles.el 2012-09-17 05:41:04 +0000 @@ -352,8 +352,8 @@ If DONT-OVERRIDE is neither nil nor t, style variables whose default values have been set (more precisely, whose default values are not the symbol `set-from-style') will not be changed. This avoids overriding global settings -done in ~/.emacs. It is useful to call c-set-style from a mode hook in this -way. +done in your init file. It is useful to call c-set-style from a mode hook +in this way. If DONT-OVERRIDE is t, style variables that already have values (i.e., whose values are not the symbol `set-from-style') will not be overridden. CC Mode === modified file 'lisp/progmodes/cmacexp.el' --- lisp/progmodes/cmacexp.el 2012-07-25 05:48:19 +0000 +++ lisp/progmodes/cmacexp.el 2012-09-17 05:41:04 +0000 @@ -49,7 +49,7 @@ ;; INSTALLATION ====================================================== -;; Put the following in your ~/.emacs file. +;; Put the following in your init file. ;; If you want the *Macroexpansion* window to be not higher than ;; necessary: === modified file 'lisp/progmodes/ebnf2ps.el' --- lisp/progmodes/ebnf2ps.el 2012-07-25 05:48:19 +0000 +++ lisp/progmodes/ebnf2ps.el 2012-09-17 05:41:04 +0000 @@ -43,7 +43,7 @@ ;; ;; This package translates an EBNF to a syntactic chart on PostScript. ;; -;; To use ebnf2ps, insert in your ~/.emacs: +;; To use ebnf2ps, insert in your init file: ;; ;; (require 'ebnf2ps) ;; @@ -772,7 +772,7 @@ ;; ;; To set the above options you may: ;; -;; a) insert the code in your ~/.emacs, like: +;; a) insert the code in your init file, like: ;; ;; (setq ebnf-terminal-shape 'bevel) ;; === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2012-06-29 06:28:37 +0000 +++ lisp/progmodes/f90.el 2012-09-17 05:41:04 +0000 @@ -102,10 +102,9 @@ ;; (abbrev-mode 1) ; turn on abbreviation mode ;; (f90-add-imenu-menu) ; extra menu with functions etc. ;; (if f90-auto-keyword-case ; change case of all keywords on startup -;; (f90-change-keywords f90-auto-keyword-case)) -;; )) +;; (f90-change-keywords f90-auto-keyword-case)))) ;; -;; in your .emacs file. You can also customize the lists +;; in your init file. You can also customize the lists ;; f90-font-lock-keywords, etc. ;; ;; The auto-fill and abbreviation minor modes are accessible from the F90 menu, === modified file 'lisp/progmodes/hideshow.el' --- lisp/progmodes/hideshow.el 2012-08-28 16:01:59 +0000 +++ lisp/progmodes/hideshow.el 2012-09-17 05:41:04 +0000 @@ -52,7 +52,7 @@ ;; ;; First make sure hideshow.el is in a directory in your `load-path'. ;; You can optionally byte-compile it using `M-x byte-compile-file'. -;; Then, add the following to your ~/.emacs: +;; Then, add the following to your init file: ;; ;; (load-library "hideshow") ;; (add-hook 'X-mode-hook ; other modes similarly === modified file 'lisp/progmodes/idlw-complete-structtag.el' --- lisp/progmodes/idlw-complete-structtag.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/idlw-complete-structtag.el 2012-09-17 05:41:04 +0000 @@ -53,8 +53,8 @@ ;; ;; INSTALLATION ;; ============ -;; Put this file on the emacs load path and load it with the following -;; line in your .emacs file: +;; Put this file on the emacs load path and load it with the following +;; line in your init file: ;; ;; (add-hook 'idlwave-load-hook ;; (lambda () (require 'idlw-complete-structtag))) === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2012-06-02 10:56:09 +0000 +++ lisp/progmodes/idlw-shell.el 2012-09-17 05:41:04 +0000 @@ -48,7 +48,7 @@ ;; ;; Follow the instructions in the INSTALL file of the distribution. ;; In short, put this file on your load path and add the following -;; lines to your .emacs file: +;; lines to your init file: ;; ;; (autoload 'idlwave-shell "idlw-shell" "IDLWAVE Shell" t) ;; @@ -111,9 +111,7 @@ The \"^\r?\" is needed, to indicate the beginning of the line, with optional return character (which IDL seems to output randomly). This variable is used to initialize `comint-prompt-regexp' in the -process buffer. - -This is a fine thing to set in your `.emacs' file." +process buffer." :group 'idlwave-shell-general-setup :type 'regexp) === modified file 'lisp/progmodes/idlwave.el' --- lisp/progmodes/idlwave.el 2012-06-26 16:23:01 +0000 +++ lisp/progmodes/idlwave.el 2012-09-17 05:41:04 +0000 @@ -51,7 +51,7 @@ ;; ;; Follow the instructions in the INSTALL file of the distribution. ;; In short, put this file on your load path and add the following -;; lines to your .emacs file: +;; lines to your init file: ;; ;; (autoload 'idlwave-mode "idlwave" "IDLWAVE Mode" t) ;; (autoload 'idlwave-shell "idlw-shell" "IDLWAVE Shell" t) @@ -746,7 +746,7 @@ field names act like abbrevs in certain circumstances. Changes to this in `idlwave-mode-hook' will have no effect. Instead a user -must set it directly using `setq' in the .emacs file before idlwave.el +must set it directly using `setq' in the init file before idlwave.el is loaded." :group 'idlwave-abbrev-and-indent-action :type 'string) === modified file 'lisp/progmodes/inf-lisp.el' --- lisp/progmodes/inf-lisp.el 2012-04-09 13:05:48 +0000 +++ lisp/progmodes/inf-lisp.el 2012-09-17 05:41:04 +0000 @@ -168,9 +168,7 @@ More precise choices: Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\" franz: \"^\\\\(->\\\\|<[0-9]*>:\\\\) *\" -kcl: \"^>+ *\" - -This is a fine thing to set in your .emacs file or through Custom." +kcl: \"^>+ *\"" :type 'regexp :group 'inferior-lisp) === modified file 'lisp/progmodes/mixal-mode.el' --- lisp/progmodes/mixal-mode.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/mixal-mode.el 2012-09-17 05:41:04 +0000 @@ -32,7 +32,7 @@ ;; GNU MDK from `https://savannah.gnu.org/projects/mdk/' and ;; `ftp://ftp.gnu.org/pub/gnu/mdk'. ;; -;; To use this mode, place the following in your .emacs file: +;; To use this mode, place the following in your init file: ;; `(load-file "/PATH-TO-FILE/mixal-mode.el")'. ;; When you load a file with the extension .mixal the mode will be started ;; automatic. If you want to start the mode manual, use `M-x mixal-mode'. === modified file 'lisp/progmodes/octave-mod.el' --- lisp/progmodes/octave-mod.el 2012-05-05 02:50:20 +0000 +++ lisp/progmodes/octave-mod.el 2012-09-17 05:41:04 +0000 @@ -585,12 +585,12 @@ Turning on Octave mode runs the hook `octave-mode-hook'. To begin using this mode for all `.m' files that you edit, add the -following lines to your `.emacs' file: +following lines to your init file: (add-to-list 'auto-mode-alist '(\"\\\\.m\\\\'\" . octave-mode)) To automatically turn on the abbrev and auto-fill features, -add the following lines to your `.emacs' file as well: +add the following lines to your init file as well: (add-hook 'octave-mode-hook (lambda () === modified file 'lisp/progmodes/perl-mode.el' --- lisp/progmodes/perl-mode.el 2012-08-15 16:29:11 +0000 +++ lisp/progmodes/perl-mode.el 2012-09-17 05:41:04 +0000 @@ -28,14 +28,14 @@ ;;; Commentary: ;; To enter perl-mode automatically, add (autoload 'perl-mode "perl-mode") -;; to your .emacs file and change the first line of your perl script to: +;; to your init file and change the first line of your perl script to: ;; #!/usr/bin/perl -- # -*-Perl-*- ;; With arguments to perl: ;; #!/usr/bin/perl -P- # -*-Perl-*- ;; To handle files included with do 'filename.pl';, add something like ;; (setq auto-mode-alist (append (list (cons "\\.pl\\'" 'perl-mode)) ;; auto-mode-alist)) -;; to your .emacs file; otherwise the .pl suffix defaults to prolog-mode. +;; to your init file; otherwise the .pl suffix defaults to prolog-mode. ;; This code is based on the 18.53 version c-mode.el, with extensive ;; rewriting. Most of the features of c-mode survived intact. === modified file 'lisp/progmodes/prolog.el' --- lisp/progmodes/prolog.el 2012-05-11 20:05:19 +0000 +++ lisp/progmodes/prolog.el 2012-09-17 05:41:04 +0000 @@ -60,9 +60,7 @@ ;;; Installation: ;; -;; Insert the following lines in your init file--typically ~/.emacs -;; (GNU Emacs and XEmacs <21.4), or ~/.xemacs/init.el (XEmacs -;; 21.4)--to use this mode when editing Prolog files under Emacs: +;; Insert the following lines in your init file: ;; ;; (setq load-path (cons "/usr/lib/xemacs/site-lisp" load-path)) ;; (autoload 'run-prolog "prolog" "Start a Prolog sub-process." t) === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2012-09-10 19:22:53 +0000 +++ lisp/progmodes/sql.el 2012-09-17 05:41:04 +0000 @@ -268,9 +268,8 @@ (defcustom sql-password "" "Default password. - -Storing your password in a textfile such as ~/.emacs could be dangerous. -Customizing your password will store it in your ~/.emacs file." +If you customize this, the value will be stored in your init +file. Since that is a plaintext file, this could be dangerous." :type 'string :group 'SQL :risky t) @@ -1285,8 +1284,8 @@ ["List all objects" sql-list-all (sql-get-product-feature sql-product :list-all)] ["List table details" sql-list-table (sql-get-product-feature sql-product :list-table)])) -;; Abbreviations -- if you want more of them, define them in your -;; ~/.emacs file. Abbrevs have to be enabled in your ~/.emacs, too. +;; Abbreviations -- if you want more of them, define them in your init +;; file. Abbrevs have to be enabled in your init file, too. (defvar sql-mode-abbrev-table nil "Abbrev table used in `sql-mode' and `sql-interactive-mode'.") @@ -3715,8 +3714,8 @@ `sql-interactive-mode'. Note that SQL doesn't have an escape character unless you specify -one. If you specify backslash as escape character in SQL, -you must tell Emacs. Here's how to do that in your `~/.emacs' file: +one. If you specify backslash as escape character in SQL, you +must tell Emacs. Here's how to do that in your init file: \(add-hook 'sql-mode-hook (lambda () @@ -3806,7 +3805,7 @@ If you want to make SQL buffers limited in length, add the function `comint-truncate-buffer' to `comint-output-filter-functions'. -Here is an example for your .emacs file. It keeps the SQLi buffer a +Here is an example for your init file. It keeps the SQLi buffer a certain length. \(add-hook 'sql-interactive-mode-hook === modified file 'lisp/progmodes/verilog-mode.el' --- lisp/progmodes/verilog-mode.el 2012-05-29 06:16:49 +0000 +++ lisp/progmodes/verilog-mode.el 2012-09-17 05:41:04 +0000 @@ -8790,7 +8790,7 @@ \\[find-alternate-file] RET to have these take effect after editing them! If you want to disable the \"Process `eval' or hook local variables\" -warning message, you need to add to your .emacs file: +warning message, you need to add to your init file: (setq enable-local-eval t)" (let ((origbuf (current-buffer))) @@ -11756,7 +11756,7 @@ // For this example we declare the function in the // module's file itself. Often you'd define it instead - // in a site-start.el or .emacs file. + // in a site-start.el or init file. /* Local Variables: eval: === modified file 'lisp/ps-print.el' --- lisp/ps-print.el 2012-01-19 07:21:25 +0000 +++ lisp/ps-print.el 2012-09-17 05:41:04 +0000 @@ -1042,7 +1042,7 @@ ;; variables `ps-bold-faces', `ps-italic-faces' and `ps-underlined-faces'. ;; These variables contain lists of faces that ps-print should consider bold, ;; italic or underline; to set them, put code like the following into your -;; .emacs file: +;; init file: ;; ;; (setq ps-bold-faces '(my-blue-face)) ;; (setq ps-italic-faces '(my-red-face)) === modified file 'lisp/saveplace.el' --- lisp/saveplace.el 2012-03-04 16:56:21 +0000 +++ lisp/saveplace.el 2012-09-17 05:41:04 +0000 @@ -56,13 +56,12 @@ where it was when you previously visited the same file. This variable is automatically buffer-local. -If you wish your place in any file to always be automatically saved, -simply put this in your `~/.emacs' file: +If you wish your place in any file to always be automatically +saved, set this to t using the Customize facility, or put the +following code in your init file: \(setq-default save-place t) -\(require 'saveplace) - -or else use the Custom facility to set this option." +\(require 'saveplace)" :type 'boolean :require 'saveplace :group 'save-place) @@ -148,7 +147,8 @@ If called with a prefix arg, the mode is enabled if and only if the argument is positive. -To save places automatically in all files, put this in your `.emacs' file: +To save places automatically in all files, put this in your init +file: \(setq-default save-place t\)" (interactive "P") === modified file 'lisp/shell.el' --- lisp/shell.el 2012-09-17 05:01:10 +0000 +++ lisp/shell.el 2012-09-17 05:41:04 +0000 @@ -46,7 +46,7 @@ ;; YOUR .EMACS FILE ;;============================================================================= -;; Some suggestions for your .emacs file. +;; Some suggestions for your init file. ;; ;; ;; Define M-# to run some strange command: ;; (eval-after-load "shell" === modified file 'lisp/speedbar.el' --- lisp/speedbar.el 2012-09-06 09:38:56 +0000 +++ lisp/speedbar.el 2012-09-17 05:41:04 +0000 @@ -706,7 +706,7 @@ singular expression. This variable will be turned into `speedbar-file-regexp' for use with speedbar. You should use the function `speedbar-add-supported-extension' to add a new extension at -runtime, or use the configuration dialog to set it in your .emacs file. +runtime, or use the configuration dialog to set it in your init file. If you add an extension to this list, and it does not appear, you may need to also modify `completion-ignored-extension' which will also help file completion." === modified file 'lisp/startup.el' --- lisp/startup.el 2012-07-23 17:27:41 +0000 +++ lisp/startup.el 2012-09-17 05:41:04 +0000 @@ -71,12 +71,13 @@ "Non-nil inhibits the initial startup echo area message. Setting this variable takes effect only if you do it with the customization buffer -or if your `.emacs' file contains a line of this form: +or if your init file contains a line of this form: (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\") -If your `.emacs' file is byte-compiled, use the following form instead: +If your init file is byte-compiled, use the following form +instead: (eval '(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")) -Thus, someone else using a copy of your `.emacs' file will see -the startup message unless he personally acts to inhibit it." +Thus, someone else using a copy of your init file will see the +startup message unless he personally acts to inhibit it." :type '(choice (const :tag "Don't inhibit") (string :tag "Enter your user name, to inhibit")) :group 'initialization) @@ -261,10 +262,14 @@ "Normal hook run after handling urgent options but before loading init files.") (defvar after-init-hook nil - "Normal hook run after loading the init files, `~/.emacs' and `default.el'. -There is no `condition-case' around the running of these functions; -therefore, if you set `debug-on-error' non-nil in `.emacs', -an error in one of these functions will invoke the debugger.") + "Normal hook run after initializing the Emacs session. +It is run after Emacs loads the init file, `default' library, the +abbrevs file, and additional Lisp packages (if any), and setting +the value of `after-init-time'. + +There is no `condition-case' around the running of this hook; +therefore, if `debug-on-error' is non-nil, an error in one of +these functions will invoke the debugger.") (defvar emacs-startup-hook nil "Normal hook run after loading init files and handling the command line.") @@ -296,7 +301,7 @@ :group 'initialization) (defvar init-file-user nil - "Identity of user whose `.emacs' file is or was read. + "Identity of user whose init file is or was read. The value is nil if `-q' or `--no-init-file' was specified, meaning do not load any init file. @@ -306,7 +311,7 @@ use that person's init file. In either of the latter cases, `(concat \"~\" init-file-user \"/\")' -evaluates to the name of the directory where the `.emacs' file was +evaluates to the name of the directory where the init file was looked for. Setting `init-file-user' does not prevent Emacs from loading @@ -365,7 +370,7 @@ (t (concat user-emacs-directory "auto-save-list/.saves-"))) "Prefix for generating `auto-save-list-file-name'. -This is used after reading your `.emacs' file to initialize +This is used after reading your init file to initialize `auto-save-list-file-name', by appending Emacs's pid and the system name, if you have not already set `auto-save-list-file-name' yourself. Directories in the prefix will be created if necessary. === modified file 'lisp/strokes.el' --- lisp/strokes.el 2012-08-15 16:29:11 +0000 +++ lisp/strokes.el 2012-09-17 05:41:04 +0000 @@ -933,14 +933,7 @@ extracting the strokes for editing use once again, so the editing cycle can continue. -Strokes are easy to program and fun to use. To start strokes going, -you'll want to put the following line in your .emacs file as mentioned -in the commentary to strokes.el. - -This will load strokes when and only when you start Emacs on a window -system, with a mouse or other pointer device defined. - -To toggle strokes-mode, you just do +To toggle strokes-mode, invoke the command > M-x strokes-mode === modified file 'lisp/term/iris-ansi.el' --- lisp/term/iris-ansi.el 2012-05-01 06:59:34 +0000 +++ lisp/term/iris-ansi.el 2012-09-17 05:41:04 +0000 @@ -322,7 +322,7 @@ "Terminal initialization function for iris-ansi." ;; Use inheritance to let the main keymap override these defaults. ;; This way we don't override terminfo-derived settings or settings - ;; made in the .emacs file. + ;; made in the init file. (let ((m (copy-keymap iris-function-map))) (set-keymap-parent m (keymap-parent input-decode-map)) (set-keymap-parent input-decode-map m))) === modified file 'lisp/term/lk201.el' --- lisp/term/lk201.el 2012-05-01 06:59:34 +0000 +++ lisp/term/lk201.el 2012-09-17 05:41:04 +0000 @@ -75,7 +75,7 @@ (defun terminal-init-lk201 () ;; Use inheritance to let the main keymap override these defaults. ;; This way we don't override terminfo-derived settings or settings - ;; made in the .emacs file. + ;; made in the init file. (let ((m (copy-keymap lk201-function-map))) (set-keymap-parent m (keymap-parent input-decode-map)) (set-keymap-parent input-decode-map m))) === modified file 'lisp/term/rxvt.el' --- lisp/term/rxvt.el 2012-01-19 07:21:25 +0000 +++ lisp/term/rxvt.el 2012-09-17 05:41:04 +0000 @@ -166,7 +166,7 @@ ;; Use inheritance to let the main keymap override those defaults. ;; This way we don't override terminfo-derived settings or settings - ;; made in the .emacs file. + ;; made in the init file. (let ((m (copy-keymap rxvt-function-map))) (set-keymap-parent m (keymap-parent input-decode-map)) (set-keymap-parent input-decode-map m)) === modified file 'lisp/term/tvi970.el' --- lisp/term/tvi970.el 2012-07-11 23:13:41 +0000 +++ lisp/term/tvi970.el 2012-09-17 05:41:04 +0000 @@ -93,7 +93,7 @@ "Terminal initialization function for tvi970." ;; Use inheritance to let the main keymap override these defaults. ;; This way we don't override terminfo-derived settings or settings - ;; made in the .emacs file. + ;; made in the init file. (let ((m (copy-keymap tvi970-terminal-map))) (set-keymap-parent m (keymap-parent input-decode-map)) (set-keymap-parent input-decode-map m)) === modified file 'lisp/term/wyse50.el' --- lisp/term/wyse50.el 2012-05-01 06:59:34 +0000 +++ lisp/term/wyse50.el 2012-09-17 05:41:04 +0000 @@ -109,7 +109,7 @@ "Terminal initialization function for wyse50." ;; Use inheritance to let the main keymap override these defaults. ;; This way we don't override terminfo-derived settings or settings - ;; made in the .emacs file. + ;; made in the init file. (let ((m (copy-keymap wyse50-terminal-map))) (set-keymap-parent m (keymap-parent input-decode-map)) (set-keymap-parent input-decode-map m)) === modified file 'lisp/term/xterm.el' --- lisp/term/xterm.el 2012-06-16 09:56:15 +0000 +++ lisp/term/xterm.el 2012-09-17 05:41:04 +0000 @@ -480,7 +480,7 @@ ;; Use inheritance to let the main keymap override those defaults. ;; This way we don't override terminfo-derived settings or settings - ;; made in the .emacs file. + ;; made in the init file. (set-keymap-parent map (keymap-parent input-decode-map)) (set-keymap-parent input-decode-map map))) === modified file 'lisp/textmodes/flyspell.el' --- lisp/textmodes/flyspell.el 2012-06-08 16:39:49 +0000 +++ lisp/textmodes/flyspell.el 2012-09-17 05:41:04 +0000 @@ -290,9 +290,9 @@ ;;* Mode specific options enable users to disable flyspell on */ ;;* certain word depending of the emacs mode. For instance, when */ ;;* using flyspell with mail-mode add the following expression */ -;;* in your .emacs file: */ +;;* in your init file: */ ;;* (add-hook 'mail-mode */ -;;* (lambda () (setq flyspell-generic-check-word-predicate */ +;;* (lambda () (setq flyspell-generic-check-word-predicate */ ;;* 'mail-mode-flyspell-verify))) */ ;;*---------------------------------------------------------------------*/ (defvar flyspell-generic-check-word-predicate nil @@ -488,7 +488,7 @@ Consider using the `ispell-parser' to check your text. For instance consider adding: \(add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex)))) -in your .emacs file. +in your init file. \\[flyspell-region] checks all words inside a region. \\[flyspell-buffer] checks the whole buffer." === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2012-06-26 16:23:01 +0000 +++ lisp/textmodes/ispell.el 2012-09-17 05:41:04 +0000 @@ -1127,7 +1127,8 @@ ;; If Emacs flavor supports [:alpha:] use it for global dicts. If ;; spellchecker also supports UTF-8 via command-line option use it - ;; in communication. This does not affect definitions in ~/.emacs. + ;; in communication. This does not affect definitions in your + ;; init file. (if ispell-emacs-alpha-regexp (let (tmp-dicts-alist) (dolist (adict ispell-dictionary-alist) @@ -3680,7 +3681,7 @@ The `X' command aborts sending the message so that you can edit the buffer. To spell-check whenever a message is sent, include the appropriate lines -in your .emacs file: +in your init file: (add-hook 'message-send-hook 'ispell-message) ;; GNUS 5 (add-hook 'news-inews-hook 'ispell-message) ;; GNUS 4 (add-hook 'mail-send-hook 'ispell-message) === modified file 'lisp/textmodes/reftex.el' --- lisp/textmodes/reftex.el 2012-08-03 06:47:32 +0000 +++ lisp/textmodes/reftex.el 2012-09-17 05:41:04 +0000 @@ -47,7 +47,7 @@ ;; To turn RefTeX Mode on and off in a buffer, use `M-x reftex-mode'. ;; ;; To turn on RefTeX Mode for all LaTeX files, add the following lines -;; to your .emacs file: +;; to your init file: ;; ;; (add-hook 'LaTeX-mode-hook 'turn-on-reftex) ; AUCTeX LaTeX mode ;; (add-hook 'latex-mode-hook 'turn-on-reftex) ; Emacs latex mode @@ -99,7 +99,7 @@ ;; ;; To turn RefTeX Mode on and off in a particular buffer, use `M-x ;; reftex-mode'. To turn on RefTeX Mode for all LaTeX files, add the -;; following lines to your `.emacs' file: +;; following lines to your init file: ;; ;; (add-hook 'LaTeX-mode-hook 'turn-on-reftex) ; with AUCTeX LaTeX mode ;; (add-hook 'latex-mode-hook 'turn-on-reftex) ; with Emacs latex mode === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2012-08-15 16:29:11 +0000 +++ lisp/textmodes/rst.el 2012-09-17 05:41:04 +0000 @@ -81,7 +81,7 @@ ;;; INSTALLATION -;; Add the following lines to your `.emacs' file: +;; Add the following lines to your init file: ;; ;; (require 'rst) ;; === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2012-07-11 23:13:41 +0000 +++ lisp/textmodes/sgml-mode.el 2012-09-17 05:41:04 +0000 @@ -451,7 +451,7 @@ N defaults to -1, which means to wrap it around the current region. If you like upcased tags, put (setq sgml-transformation-function 'upcase) -in your `.emacs' file. +in your init file. Use \\[sgml-validate] to validate your document with an SGML parser. === modified file 'lisp/textmodes/table.el' --- lisp/textmodes/table.el 2012-06-08 16:39:49 +0000 +++ lisp/textmodes/table.el 2012-09-17 05:41:04 +0000 @@ -126,7 +126,7 @@ ;; again. ;; ;; To use the package regularly place this file in the site library -;; directory and add the next expression in your .emacs file. Make +;; directory and add the next expression in your init file. Make ;; sure that directory is included in the `load-path'. ;; ;; (require 'table) @@ -342,10 +342,10 @@ ;; (function (lambda () ;; (local-set-key [] ')))) ;; -;; Above code is well known ~/.emacs idiom for customizing a mode -;; specific keymap however it does not work for this package. This is -;; because there is no table mode in effect. This package does not -;; use a local map therefore you must modify `table-cell-map' +;; Adding the above to your init file is a common way to customize a +;; mode specific keymap. However it does not work for this package. +;; This is because there is no table mode in effect. This package +;; does not use a local map therefore you must modify `table-cell-map' ;; explicitly. The correct way of achieving above task is: ;; ;; (add-hook 'table-cell-map-hook === modified file 'lisp/textmodes/two-column.el' --- lisp/textmodes/two-column.el 2012-04-16 20:13:38 +0000 +++ lisp/textmodes/two-column.el 2012-09-17 05:41:04 +0000 @@ -276,8 +276,9 @@ \\[2C-merge] Merge both buffers \\[2C-dissociate] Dissociate the two buffers -These keybindings can be customized in your ~/.emacs by `2C-mode-map', -`2C-minor-mode-map' and by binding `2C-command' to some prefix. +These keybindings can be customized in your init file by +`2C-mode-map', `2C-minor-mode-map' and by binding `2C-command' to +some prefix. The appearance of the screen can be customized by the variables `2C-window-width', `2C-beyond-fill-column', `2C-mode-line-format' and === modified file 'lisp/time-stamp.el' --- lisp/time-stamp.el 2012-01-19 07:21:25 +0000 +++ lisp/time-stamp.el 2012-09-17 05:41:04 +0000 @@ -29,7 +29,7 @@ ;; static char *ts = "sdmain.c Time-stamp: <2001-08-13 10:20:51 gildea>"; ;; See the top of `time-stamp.el' for another example. -;; To use time-stamping, add this line to your .emacs file: +;; To use time-stamping, add this line to your init file: ;; (add-hook 'before-save-hook 'time-stamp) ;; Now any time-stamp templates in your files will be updated automatically. @@ -254,7 +254,7 @@ (defun time-stamp () "Update the time stamp string(s) in the buffer. A template in a file can be automatically updated with a new time stamp -every time you save the file. Add this line to your .emacs file: +every time you save the file. Add this line to your init file: (add-hook 'before-save-hook 'time-stamp) or customize `before-save-hook' through Custom. Normally the template must appear in the first 8 lines of a file and === modified file 'lisp/url/url-methods.el' --- lisp/url/url-methods.el 2012-07-11 23:13:41 +0000 +++ lisp/url/url-methods.el 2012-09-17 05:41:04 +0000 @@ -79,7 +79,7 @@ ;; Store any proxying information - this will not overwrite an old ;; entry, so that people can still set this information in their - ;; .emacs file + ;; init file (cond (cur-proxy nil) ; Keep their old settings ((null env-proxy) nil) ; No proxy setup === modified file 'lisp/vc/pcvs-defs.el' --- lisp/vc/pcvs-defs.el 2012-07-10 11:51:54 +0000 +++ lisp/vc/pcvs-defs.el 2012-09-17 05:41:04 +0000 @@ -57,11 +57,7 @@ ;;;; END OF THINGS TO CHECK WHEN INSTALLING ;;;; -------------------------------------------------------- -;;;; ;;;; User configuration variables: -;;;; -;;;; NOTE: these should be set in your ~/.emacs (or site-lisp/default.el) file. -;;;; (defgroup pcl-cvs nil "Special support for the CVS versioning system." === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2012-07-25 05:48:19 +0000 +++ lisp/vc/vc-git.el 2012-09-17 05:41:04 +0000 @@ -31,7 +31,7 @@ ;; To install: put this file on the load-path and add Git to the list ;; of supported backends in `vc-handled-backends'; the following line, -;; placed in your ~/.emacs, will accomplish this: +;; placed in your init file, will accomplish this: ;; ;; (add-to-list 'vc-handled-backends 'Git) === modified file 'lisp/windmove.el' --- lisp/windmove.el 2012-07-25 05:48:19 +0000 +++ lisp/windmove.el 2012-09-17 05:41:04 +0000 @@ -94,7 +94,7 @@ ;; Installation: ;; -;; Put the following line in your `.emacs' file: +;; Put the following line in your init file: ;; ;; (windmove-default-keybindings) ; shifted arrow keys ;;