[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110062: Update docstrings and commen
|
From: |
Chong Yidong |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110062: Update docstrings and comments to use "init file" terminology. |
|
Date: |
Mon, 17 Sep 2012 13:41:04 +0800 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110062
committer: Chong Yidong <address@hidden>
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.
modified:
lisp/ChangeLog
lisp/align.el
lisp/autoinsert.el
lisp/bookmark.el
lisp/calc/calc-ext.el
lisp/calc/calc-forms.el
lisp/calendar/calendar.el
lisp/calendar/diary-lib.el
lisp/calendar/holidays.el
lisp/calendar/lunar.el
lisp/calendar/solar.el
lisp/calendar/timeclock.el
lisp/comint.el
lisp/custom.el
lisp/desktop.el
lisp/emacs-lisp/byte-run.el
lisp/emacs-lisp/cl-lib.el
lisp/emulation/edt-mapper.el
lisp/emulation/edt.el
lisp/emulation/tpu-edt.el
lisp/emulation/tpu-extras.el
lisp/emulation/tpu-mapper.el
lisp/emulation/vi.el
lisp/emulation/viper.el
lisp/erc/ChangeLog
lisp/erc/erc-button.el
lisp/erc/erc-capab.el
lisp/erc/erc-match.el
lisp/erc/erc-netsplit.el
lisp/erc/erc-page.el
lisp/erc/erc-replace.el
lisp/erc/erc-stamp.el
lisp/erc/erc-track.el
lisp/eshell/em-alias.el
lisp/eshell/esh-util.el
lisp/ffap.el
lisp/filesets.el
lisp/flow-ctrl.el
lisp/font-lock.el
lisp/frame.el
lisp/generic-x.el
lisp/hi-lock.el
lisp/ibuffer.el
lisp/ielm.el
lisp/international/ogonek.el
lisp/locate.el
lisp/mail/feedmail.el
lisp/mail/mail-hist.el
lisp/mail/uce.el
lisp/mouse-copy.el
lisp/mouse-drag.el
lisp/net/ange-ftp.el
lisp/net/browse-url.el
lisp/net/goto-addr.el
lisp/net/newsticker.el
lisp/net/quickurl.el
lisp/net/tramp-cmds.el
lisp/net/webjump.el
lisp/novice.el
lisp/pcomplete.el
lisp/play/bubbles.el
lisp/play/decipher.el
lisp/play/handwrite.el
lisp/printing.el
lisp/progmodes/antlr-mode.el
lisp/progmodes/cc-styles.el
lisp/progmodes/cmacexp.el
lisp/progmodes/ebnf2ps.el
lisp/progmodes/f90.el
lisp/progmodes/hideshow.el
lisp/progmodes/idlw-complete-structtag.el
lisp/progmodes/idlw-shell.el
lisp/progmodes/idlwave.el
lisp/progmodes/inf-lisp.el
lisp/progmodes/mixal-mode.el
lisp/progmodes/octave-mod.el
lisp/progmodes/perl-mode.el
lisp/progmodes/prolog.el
lisp/progmodes/sql.el
lisp/progmodes/verilog-mode.el
lisp/ps-print.el
lisp/saveplace.el
lisp/shell.el
lisp/speedbar.el
lisp/startup.el
lisp/strokes.el
lisp/term/iris-ansi.el
lisp/term/lk201.el
lisp/term/rxvt.el
lisp/term/tvi970.el
lisp/term/wyse50.el
lisp/term/xterm.el
lisp/textmodes/flyspell.el
lisp/textmodes/ispell.el
lisp/textmodes/reftex.el
lisp/textmodes/rst.el
lisp/textmodes/sgml-mode.el
lisp/textmodes/table.el
lisp/textmodes/two-column.el
lisp/time-stamp.el
lisp/url/url-methods.el
lisp/vc/pcvs-defs.el
lisp/vc/vc-git.el
lisp/windmove.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-09-17 05:01:10 +0000
+++ b/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 <address@hidden>
* mail/mailabbrev.el (mail-abbrev-expand-hook): Work for a mail aliasee
=== modified file 'lisp/align.el'
--- a/lisp/align.el 2012-09-16 16:27:20 +0000
+++ b/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'
--- a/lisp/autoinsert.el 2012-06-26 16:23:01 +0000
+++ b/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'
--- a/lisp/bookmark.el 2012-08-08 08:48:57 +0000
+++ b/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'
--- a/lisp/calc/calc-ext.el 2012-09-13 18:41:21 +0000
+++ b/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'
--- a/lisp/calc/calc-forms.el 2012-05-04 06:13:18 +0000
+++ b/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'
--- a/lisp/calendar/calendar.el 2012-06-26 07:13:40 +0000
+++ b/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'
--- a/lisp/calendar/diary-lib.el 2012-08-20 18:13:03 +0000
+++ b/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'
--- a/lisp/calendar/holidays.el 2012-09-05 07:05:56 +0000
+++ b/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'
--- a/lisp/calendar/lunar.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/calendar/solar.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/calendar/timeclock.el 2012-08-15 16:29:11 +0000
+++ b/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'
--- a/lisp/comint.el 2012-08-15 16:29:11 +0000
+++ b/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'
--- a/lisp/custom.el 2012-09-10 15:52:15 +0000
+++ b/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'
--- a/lisp/desktop.el 2012-07-26 01:27:33 +0000
+++ b/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'
--- a/lisp/emacs-lisp/byte-run.el 2012-09-07 20:14:55 +0000
+++ b/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'
--- a/lisp/emacs-lisp/cl-lib.el 2012-08-28 20:14:21 +0000
+++ b/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'
--- a/lisp/emulation/edt-mapper.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/emulation/edt.el 2012-06-19 07:05:44 +0000
+++ b/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'
--- a/lisp/emulation/tpu-edt.el 2012-05-13 03:05:06 +0000
+++ b/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'
--- a/lisp/emulation/tpu-extras.el 2012-02-08 02:12:24 +0000
+++ b/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'
--- a/lisp/emulation/tpu-mapper.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/emulation/vi.el 2011-10-01 20:32:01 +0000
+++ b/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'
--- a/lisp/emulation/viper.el 2012-07-29 07:16:45 +0000
+++ b/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'
--- a/lisp/erc/ChangeLog 2012-08-28 16:01:59 +0000
+++ b/lisp/erc/ChangeLog 2012-09-17 05:41:04 +0000
@@ -1,3 +1,9 @@
+2012-09-17 Chong Yidong <address@hidden>
+
+ * erc-page.el (erc-page-function):
+
+ * erc-stamp.el (erc-stamp): Doc fix.
+
2012-08-21 Josh Feinstein <address@hidden>
* erc-join.el (erc-autojoin-timing): Fix defcustom type.
=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el 2012-06-08 16:39:49 +0000
+++ b/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'
--- a/lisp/erc/erc-capab.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/erc/erc-match.el 2012-08-21 07:52:42 +0000
+++ b/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'
--- a/lisp/erc/erc-netsplit.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/erc/erc-page.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/erc/erc-replace.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/erc/erc-stamp.el 2012-06-08 16:39:49 +0000
+++ b/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'
--- a/lisp/erc/erc-track.el 2012-06-02 10:56:09 +0000
+++ b/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'
--- a/lisp/eshell/em-alias.el 2012-06-27 07:08:06 +0000
+++ b/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'
--- a/lisp/eshell/esh-util.el 2012-01-23 08:12:10 +0000
+++ b/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'
--- a/lisp/ffap.el 2012-08-29 15:11:51 +0000
+++ b/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'
--- a/lisp/filesets.el 2012-07-10 11:51:54 +0000
+++ b/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'
--- a/lisp/flow-ctrl.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/font-lock.el 2012-08-20 07:30:40 +0000
+++ b/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'
--- a/lisp/frame.el 2012-09-06 09:29:32 +0000
+++ b/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'
--- a/lisp/generic-x.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/hi-lock.el 2012-08-14 06:52:59 +0000
+++ b/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'
--- a/lisp/ibuffer.el 2012-08-29 15:11:51 +0000
+++ b/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'
--- a/lisp/ielm.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/international/ogonek.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/locate.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/mail/feedmail.el 2012-07-29 08:18:29 +0000
+++ b/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'
--- a/lisp/mail/mail-hist.el 2012-04-09 13:05:48 +0000
+++ b/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'
--- a/lisp/mail/uce.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/mouse-copy.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/mouse-drag.el 2012-04-09 13:05:48 +0000
+++ b/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'
--- a/lisp/net/ange-ftp.el 2012-07-29 08:18:29 +0000
+++ b/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'
--- a/lisp/net/browse-url.el 2012-09-07 08:58:31 +0000
+++ b/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'
--- a/lisp/net/goto-addr.el 2012-04-09 13:05:48 +0000
+++ b/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'
--- a/lisp/net/newsticker.el 2012-06-02 10:56:09 +0000
+++ b/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'
--- a/lisp/net/quickurl.el 2012-07-11 23:13:41 +0000
+++ b/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'
--- a/lisp/net/tramp-cmds.el 2012-07-05 06:57:57 +0000
+++ b/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'
--- a/lisp/net/webjump.el 2012-04-09 13:05:48 +0000
+++ b/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'
--- a/lisp/novice.el 2012-07-11 23:13:41 +0000
+++ b/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'
--- a/lisp/pcomplete.el 2012-08-15 16:29:11 +0000
+++ b/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'
--- a/lisp/play/bubbles.el 2012-07-11 23:13:41 +0000
+++ b/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'
--- a/lisp/play/decipher.el 2012-07-11 23:13:41 +0000
+++ b/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'
--- a/lisp/play/handwrite.el 2012-02-28 08:17:21 +0000
+++ b/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'
--- a/lisp/printing.el 2012-07-29 08:18:29 +0000
+++ b/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'
--- a/lisp/progmodes/antlr-mode.el 2012-06-02 10:56:09 +0000
+++ b/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'
--- a/lisp/progmodes/cc-styles.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/progmodes/cmacexp.el 2012-07-25 05:48:19 +0000
+++ b/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'
--- a/lisp/progmodes/ebnf2ps.el 2012-07-25 05:48:19 +0000
+++ b/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'
--- a/lisp/progmodes/f90.el 2012-06-29 06:28:37 +0000
+++ b/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'
--- a/lisp/progmodes/hideshow.el 2012-08-28 16:01:59 +0000
+++ b/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'
--- a/lisp/progmodes/idlw-complete-structtag.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/progmodes/idlw-shell.el 2012-06-02 10:56:09 +0000
+++ b/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'
--- a/lisp/progmodes/idlwave.el 2012-06-26 16:23:01 +0000
+++ b/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'
--- a/lisp/progmodes/inf-lisp.el 2012-04-09 13:05:48 +0000
+++ b/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'
--- a/lisp/progmodes/mixal-mode.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/progmodes/octave-mod.el 2012-05-05 02:50:20 +0000
+++ b/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'
--- a/lisp/progmodes/perl-mode.el 2012-08-15 16:29:11 +0000
+++ b/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'
--- a/lisp/progmodes/prolog.el 2012-05-11 20:05:19 +0000
+++ b/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'
--- a/lisp/progmodes/sql.el 2012-09-10 19:22:53 +0000
+++ b/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'
--- a/lisp/progmodes/verilog-mode.el 2012-05-29 06:16:49 +0000
+++ b/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'
--- a/lisp/ps-print.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/saveplace.el 2012-03-04 16:56:21 +0000
+++ b/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'
--- a/lisp/shell.el 2012-09-17 05:01:10 +0000
+++ b/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'
--- a/lisp/speedbar.el 2012-09-06 09:38:56 +0000
+++ b/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'
--- a/lisp/startup.el 2012-07-23 17:27:41 +0000
+++ b/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'
--- a/lisp/strokes.el 2012-08-15 16:29:11 +0000
+++ b/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'
--- a/lisp/term/iris-ansi.el 2012-05-01 06:59:34 +0000
+++ b/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'
--- a/lisp/term/lk201.el 2012-05-01 06:59:34 +0000
+++ b/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'
--- a/lisp/term/rxvt.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/term/tvi970.el 2012-07-11 23:13:41 +0000
+++ b/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'
--- a/lisp/term/wyse50.el 2012-05-01 06:59:34 +0000
+++ b/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'
--- a/lisp/term/xterm.el 2012-06-16 09:56:15 +0000
+++ b/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'
--- a/lisp/textmodes/flyspell.el 2012-06-08 16:39:49 +0000
+++ b/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'
--- a/lisp/textmodes/ispell.el 2012-06-26 16:23:01 +0000
+++ b/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'
--- a/lisp/textmodes/reftex.el 2012-08-03 06:47:32 +0000
+++ b/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'
--- a/lisp/textmodes/rst.el 2012-08-15 16:29:11 +0000
+++ b/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'
--- a/lisp/textmodes/sgml-mode.el 2012-07-11 23:13:41 +0000
+++ b/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'
--- a/lisp/textmodes/table.el 2012-06-08 16:39:49 +0000
+++ b/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 [<key sequence>] '<function>))))
;;
-;; 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'
--- a/lisp/textmodes/two-column.el 2012-04-16 20:13:38 +0000
+++ b/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'
--- a/lisp/time-stamp.el 2012-01-19 07:21:25 +0000
+++ b/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'
--- a/lisp/url/url-methods.el 2012-07-11 23:13:41 +0000
+++ b/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'
--- a/lisp/vc/pcvs-defs.el 2012-07-10 11:51:54 +0000
+++ b/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'
--- a/lisp/vc/vc-git.el 2012-07-25 05:48:19 +0000
+++ b/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'
--- a/lisp/windmove.el 2012-07-25 05:48:19 +0000
+++ b/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
;;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110062: Update docstrings and comments to use "init file" terminology.,
Chong Yidong <=