Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 05:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63

Browse source 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 358-423)

   - Update from CVS
   - Remove "-face" suffix from widget faces
   - Remove "-face" suffix from custom faces
   - Remove "-face" suffix from change-log faces
   - Remove "-face" suffix from compilation faces
   - Remove "-face" suffix from diff-mode faces
   - lisp/longlines.el (longlines-visible-face): Face removed
   - Remove "-face" suffix from woman faces
   - Remove "-face" suffix from whitespace-highlight face
   - Remove "-face" suffix from ruler-mode faces
   - Remove "-face" suffix from show-paren faces
   - Remove "-face" suffix from log-view faces
   - Remove "-face" suffix from smerge faces
   - Remove "-face" suffix from show-tabs faces
   - Remove "-face" suffix from highlight-changes faces
   - Remove "-face" suffix from and downcase info faces
   - Remove "-face" suffix from pcvs faces
   - Update uses of renamed pcvs faces
   - Tweak ChangeLog
   - Remove "-face" suffix from strokes-char face
   - Remove "-face" suffix from compare-windows face
   - Remove "-face" suffix from calendar faces
   - Remove "-face" suffix from diary-button face
   - Remove "-face" suffix from testcover faces
   - Remove "-face" suffix from viper faces
   - Remove "-face" suffix from org faces
   - Remove "-face" suffix from sgml-namespace face
   - Remove "-face" suffix from table-cell face
   - Remove "-face" suffix from tex-mode faces
   - Remove "-face" suffix from texinfo-heading face
   - Remove "-face" suffix from flyspell faces
   - Remove "-face" suffix from gomoku faces
   - Remove "-face" suffix from mpuz faces
   - Merge from gnus--rel--5.10
   - Remove "-face" suffix from Buffer-menu-buffer face
   - Remove "-face" suffix from antlr-mode faces
   - Remove "-face" suffix from ebrowse faces
   - Remove "-face" suffix from flymake faces
   - Remove "-face" suffix from idlwave faces
   - Remove "-face" suffix from sh-script faces
   - Remove "-face" suffix from vhdl-mode faces
   - Remove "-face" suffix from which-func face
   - Remove "-face" suffix from cperl-mode faces
   - Remove "-face" suffix from ld-script faces
   - Fix cperl-mode font-lock problem
   - Tweak which-func face

 * gnus--rel--5.10  (patch 80-82)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
This commit is contained in:
Miles Bader 2005-06-15 23:32:15 +00:00
commit 2092fd2b33
190 changed files with 5312 additions and 2807 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
admin/ChangeLog
View file

@ -1,3 +1,8 @@
2005-06-10 Lute Kamstra <lute@gnu.org>
* admin.el (set-version): Set version in lisp manual too.
* make-tarball.txt: Commit lispref/elisp.texi too.
2005-06-04 Richard M. Stallman <rms@gnu.org>
* emacs-pretesters: Refer to etc/DEBUG instead of duplicating it.

5
admin/FOR-RELEASE
View file

@ -18,7 +18,6 @@ See msg from rms to emacs-devel on 21 Dec.
** Enhance scroll-bar to handle tall line (similar to line-move).
** Adapt mouse-sel-mode to mouse-1-click-follows-link.
* FATAL ERRORS
@ -82,6 +81,8 @@ is encountered.
** Finish updating the Emacs Lisp manual.
*** Update lispref/README.
** Update the Emacs manual.
*** Update man/info.texi.
@ -187,7 +188,7 @@ lispref/control.texi "Luc Teirlinck" Chong Yidong
lispref/customize.texi Chong Yidong
lispref/debugging.texi Joakim Verona <joakim@verona.se> Lute Kamstra
lispref/display.texi Chong Yidong
lispref/edebug.texi Chong Yidong
lispref/edebug.texi Chong Yidong "Luc Teirlinck"
lispref/elisp.texi "Luc Teirlinck" Lute Kamstra
lispref/errors.texi "Luc Teirlinck"
lispref/eval.texi "Luc Teirlinck" Chong Yidong

3
admin/admin.el
View file

@ -83,6 +83,9 @@ Root must be the root of an Emacs source tree."
(rx (and "version" (1+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "man/emacs.texi" version
(rx (and "EMACSVER" (1+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "lispref/elisp.texi" version
(rx (and "EMACSVER" (1+ space)
(submatch (1+ (in "0-9.")))))))

8
admin/make-tarball.txt
View file

@ -22,10 +22,10 @@ For each step, check for possible errors.
5. rm configure; make bootstrap
6. Commit configure, README, AUTHORS, lisp/cus-load.el,
lisp/finder-inf.el, lisp/version.el, man/emacs.texi.
Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit
lisp/ldefs-boot.el. For a release, also commit the ChangeLog
files in all directories.
lisp/finder-inf.el, lisp/version.el, man/emacs.texi,
lispref/elisp.texi. Copy lisp/loaddefs.el to lisp/ldefs-boot.el
and commit lisp/ldefs-boot.el. For a release, also commit the
ChangeLog files in all directories.
7. make-dist --snapshot. Check the contents of the new tar with
admin/diff-tar-files against an older tar file. Some old pretest

10
etc/ChangeLog
View file

@ -1,3 +1,13 @@
2005-06-11 Eli Zaretskii <eliz@gnu.org>
* DEBUG: Mention emacs-buffer.gdb.
2005-06-10 Noah Friedman <friedman@splode.com>
* emacs-buffer.gdb (ybuffer-list): Don't use $filename; can't use
char as placeholder when buffer has no file name and process is
still live. Use different printf cases instead.
2005-06-08 Kim F. Storm <storm@cua.dk>
* PROBLEMS: Linux kernel 2.6.10 may corrupt process output.

7
etc/DEBUG
View file

@ -576,6 +576,13 @@ these data structures on the respective headers to remove the `:N'
bitfield definitions (which will cause each such field to use a full
int).
** How to recover buffer contents from an Emacs core dump file
The file etc/emacs-buffer.gdb defines a set of GDB commands for
recovering the contents of Emacs buffers from a core dump file. You
might also find those commands useful for displaying the list of
buffers in human-readable format from within the debugger.
** Some suggestions for debugging on MS Windows:
(written by Marc Fleischeuers, Geoff Voelker and Andrew Innes)

11
etc/NEWS
View file

@ -3139,6 +3139,10 @@ If APPEND is non-nil, the new element gets added at the end of the
list instead of at the beginning. This change actually occurred in
Emacs 21.1, but was not documented then.
+++
*** New function `add-to-ordered-list' is like `add-to-list' but
associates a numeric ordering of each element added to the list.
+++
*** New function `copy-tree' makes a copy of a tree.
@ -3463,6 +3467,13 @@ clone to the other.
---
*** The function `insert-string' is now obsolete.
** Filling changes.
+++
*** In determining an adaptive fill prefix, Emacs now tries the function in
`adaptive-fill-function' _before_ matching the buffer line against
`adaptive-fill-regexp' rather than _after_ it.
+++
** Atomic change groups.

10
etc/emacs-buffer.gdb
View file

@ -116,13 +116,13 @@ define ybuffer-list
if $buf->filename != Qnil
ygetptr $buf->filename
set $filename = ((struct Lisp_String *) $ptr)->data
printf "%2d %c %9d %-20s %-10s %s\n", \
$i, $modp, ($buf->text->z_byte - 1), $name, $mode, \
((struct Lisp_String *) $ptr)->data
else
set $filename = ' '
printf "%2d %c %9d %-20s %-10s\n", \
$i, $modp, ($buf->text->z_byte - 1), $name, $mode
end
printf "%2d %c %9d %-20s %-10s %s\n", \
$i, $modp, ($buf->text->z_byte - 1), $name, $mode, $filename
end
set $i++

10
lib-src/ChangeLog
View file

@ -1,3 +1,13 @@
2005-06-13 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(DOC)): Fix last change.
2005-06-12 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(DOC)): Depend on make-docfile.exe,
temacs.exe, and the preloaded *.elc files. This avoids
unnecessary dumping and DOC rebuilding.
2005-06-04 Eli Zaretskii <eliz@gnu.org>
* ntlib.h (fileno): Don't define if already defined.

2
lib-src/makefile.w32-in
View file

@ -248,7 +248,7 @@ lisp2 = \
DOC = DOC
$(DOC): make-docfile
$(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2)
- $(DEL) $(DOC)
"$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj)
"$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1)

812
lisp/ChangeLog
View file

@ -1,3 +1,806 @@
2005-06-15 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (add-to-ordered-list): Use a weak hash-table to avoid leaks.
2005-06-15 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
* textmodes/bibtex.el (bibtex-Preamble): Enclose BibTeX preamble
by field delimiters.
2005-06-15 David Ponce <david@dponce.com>
* tree-widget.el: eval-and-compile inlined functions so they will
be available at run-time too.
(tree-widget-super-format-handler)
(tree-widget-format-handler): Remove.
(tree-widget-value-create): Handle the :indent property.
2005-06-15 Miles Bader <miles@gnu.org>
* progmodes/which-func.el (which-func): Only inherit
`font-lock-function-name-face' when that makes sense against the
default mode-line face, otherwise set the face color explicitly.
* progmodes/cperl-mode.el (cperl-init-faces): Use literal cperl
faces instead of (non-existent) variables.
2005-06-14 Miles Bader <miles@gnu.org>
* progmodes/ld-script.el (ld-script-location-counter):
Remove "-face" suffix from face name.
(ld-script-location-counter-face):
New backward-compatibility alias for renamed face.
(ld-script-location-counter-face): Use renamed face.
* progmodes/cperl-mode.el (cperl-nonoverridable, cperl-array)
(cperl-hash): Remove "-face" suffix from face names.
(cperl-nonoverridable-face, cperl-array-face, cperl-hash-face):
New backward-compatibility aliases for renamed faces.
(cperl-find-pods-heres, cperl-init-faces, cperl-ps-print-init)
(cperl-ps-print-face-properties): Use renamed cperl-mode faces.
* progmodes/which-func.el (which-func): Remove "-face" suffix from face
name.
(which-func-face): New backward-compatibility alias for renamed face.
(which-func-format): Use renamed which-func face.
* progmodes/vhdl-mode.el (vhdl-prompt, vhdl-attribute, vhdl-enumvalue)
(vhdl-function, vhdl-directive, vhdl-reserved-word)
(vhdl-translate-off): Remove "-face" suffix and "font-lock-" from face
names.
(vhdl-speedbar-entity, vhdl-speedbar-architecture)
(vhdl-speedbar-configuration, vhdl-speedbar-package)
(vhdl-speedbar-library, vhdl-speedbar-instantiation)
(vhdl-speedbar-subprogram, vhdl-speedbar-entity-selected)
(vhdl-speedbar-architecture-selected)
(vhdl-speedbar-configuration-selected)
(vhdl-speedbar-package-selected)
(vhdl-speedbar-instantiation-selected): Remove "-face" suffix from face
names.
(vhdl-font-lock-keywords-2, vhdl-font-lock-keywords-5):
Use renamed faces.
(vhdl-prompt-face, vhdl-attribute-face, vhdl-enumvalue-face)
(vhdl-function-face, vhdl-directive-face, vhdl-reserved-words-face)
(vhdl-translate-off-face): Variables renamed to remove "font-lock-".
Use renamed faces.
(syntax-alist): Don't use "font-lock-" or "-face" in generated face
names.
(vhdl-font-lock-init, vhdl-ps-print-settings): Use renamed faces.
(vhdl-speedbar-insert-hierarchy, vhdl-speedbar-expand-entity)
(vhdl-speedbar-expand-package, vhdl-speedbar-update-current-unit)
(vhdl-speedbar-make-inst-line, vhdl-speedbar-make-pack-line)
(vhdl-speedbar-make-subpack-line, vhdl-speedbar-make-subprogram-line)
(vhdl-speedbar-item-info, vhdl-speedbar-check-unit): Use renamed faces.
* progmodes/sh-script.el (sh-heredoc): Remove "-face" suffix from
face name.
(sh-heredoc-face): New backward-compatibility alias for renamed face.
(sh-heredoc-face): Use renamed sh-heredoc face.
* progmodes/idlw-help.el (idlwave-help-link):
Remove "-face" suffix from face name.
(idlwave-help-link-face):
New backward-compatibility alias for renamed face.
(idlwave-highlight-linked-completions): Use renamed idlwave-help faces.
* progmodes/idlw-shell.el (idlwave-shell-bp-face)
(idlwave-shell-disabled-bp): Remove "-face" suffix from face names.
(idlwave-shell-bp-face, idlwave-shell-disabled-bp):
New backward-compatibility aliases for renamed faces.
(idlwave-shell-disabled-breakpoint-face)
(idlwave-shell-breakpoint-face): Use renamed idlwave-shell faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Remove "-face" suffix from face names.
(flymake-errline-face, flymake-warnline-face):
New backward-compatibility aliases for renamed faces.
(flymake-highlight-line): Use renamed flymake faces.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-file-name, ebrowse-default, ebrowse-member-attribute)
(ebrowse-member-class, ebrowse-progress):
Remove "-face" suffix from face names.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face):
New backward-compatibility aliases for renamed faces.
(ebrowse-show-progress, ebrowse-show-file-name-at-point)
(ebrowse-set-mark-props, ebrowse-draw-tree-fn)
(ebrowse-draw-member-buffer-class-line, ebrowse-draw-member-long-fn)
(ebrowse-draw-member-short-fn): Use renamed ebrowse faces.
* progmodes/antlr-mode.el (antlr-default, antlr-keyword, antlr-syntax)
(antlr-ruledef, antlr-tokendef, antlr-ruleref, antlr-tokenref)
(antlr-literal): Remove "-face" suffix and "font-lock-" from face names.
(antlr-font-lock-default-face, antlr-font-lock-keyword-face)
(antlr-font-lock-syntax-face, antlr-font-lock-ruledef-face)
(antlr-font-lock-tokendef-face, antlr-font-lock-ruleref-face)
(antlr-font-lock-tokenref-face, antlr-font-lock-literal-face):
New backward-compatibility aliases for renamed faces.
(antlr-default-face, antlr-keyword-face, antlr-syntax-face)
(antlr-ruledef-face, antlr-tokendef-face, antlr-ruleref-face)
(antlr-tokenref-face, antlr-literal-face): Variables renamed to remove
"font-lock-". Use renamed antlr-mode faces.
(antlr-font-lock-additional-keywords): Use renamed faces.
Replace literal face-names with face variable references.
* buff-menu.el (Buffer-menu-buffer): Remove "-face" suffix from
face name.
(Buffer-menu-buffer-face): New backward-compatibility alias for
renamed face.
(list-buffers-noselect): Use renamed Buffer-menu-buffer face.
2005-06-15 Daniel Pfeiffer <occitan@esperanto.org>
* progmodes/make-mode.el (makefile-space, makefile-makepp-perl):
Eliminate "-face" suffix.
(makefile-targets): Inherit from font-lock-function-name-face and
eliminate "-face" suffix.
(makefile-shell): Remove attributes and eliminate "-face" suffix.
(makefile-*-font-lock-keywords): Append makefile-targets in rule
actions, instead of prepending, to make it less visible.
(makefile-previous-dependency, makefile-match-dependency):
Don't match a target on a continuation line.
* files.el (auto-mode-alist): Put Makefile in gmake mode.
2005-06-15 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-tooltip-print):
Respect tooltip-use-echo-area.
(menu): Re-order menu items.
* progmodes/gud.el (tooltip-use-echo-area): Remove alias.
Define in tooltip.el.
(gud-tooltip-process-output): Respect tooltip-use-echo-area.
(gud-tooltip-tips): Respect tooltip-use-echo-area and
gud-tooltip-echo-area.
* tooltip.el (tooltip-use-echo-area): Restore from gud.el for
backward compatibility and make obsolete.
(tooltip-help-tips): Use tooltip-use-echo-area.
(tooltip-show-help-function): Rename to...
(tooltip-show-help): ...this, because it is a function.
(tooltip-mode, tooltip-help-message): Call tooltip-show-help.
2005-06-14 Luc Teirlinck <teirllm@auburn.edu>
* emacs-lisp/edebug.el (edebug-all-defs, edebug-initial-mode)
(edebug-print-length, edebug-print-level, edebug-print-circle)
(edebug-modify-breakpoint, edebug-eval-last-sexp)
(edebug-eval-print-last-sexp): Doc fixes.
2005-06-14 Kim F. Storm <storm@cua.dk>
* ido.el (ido-mode): Make a new keymap every time we enable ido,
as the coverage buffer/file/both may change.
2005-06-14 Lute Kamstra <lute@gnu.org>
* net/ange-ftp.el (internal-ange-ftp-mode): Use delay-mode-hooks
and run-mode-hooks. Simplify.
* mail/rmailedit.el (rmail-edit-mode):
* progmodes/octave-inf.el (inferior-octave-mode):
* progmodes/sql.el (sql-interactive-mode): Use delay-mode-hooks.
* recentf.el (recentf-dialog-mode): Use kill-all-local-variables
and run-mode-hooks.
(recentf-edit-list, recentf-open-files): Don't call
kill-all-local-variables directly.
* emacs-lisp/debug.el (debug-on-entry): Fix docstring.
2005-06-14 Juanma Barranquero <lekktu@gmail.com>
* emacs-lisp/byte-run.el (make-obsolete)
(define-obsolete-function-alias): Rename arguments FUNCTION and
NEW to OBSOLETE-NAME and CURRENT-NAME respectively.
(make-obsolete-variable, define-obsolete-variable-alias):
Rename arguments VARIABLE and NEW to OBSOLETE-NAME and CURRENT-NAME
respectively.
* isearchb.el (isearchb-activate):
* pcvs.el (cvs-mode):
* ses.el (ses-load):
* vc-arch.el (vc-arch-checkin, vc-arch-diff):
* net/tramp.el (tramp-find-file-exists-command)
(tramp-find-shell):
* progmodes/ada-mode.el (ada-create-case-exception)
(ada-create-case-exception-substring, ada-make-subprogram-body):
* progmodes/idlw-shell.el (idlwave-shell-move-to-bp):
* progmodes/idlwave.el (idlwave-complete-class-structure-tag-help):
* progmodes/vhdl-mode.el (vhdl-speedbar-place-component):
* textmodes/org.el (org-promote, org-evaluate-time-range)
(org-agenda-next-date-line, org-agenda-previous-date-line)
(org-agenda-error, org-open-at-point, org-table-move-row)
(org-format-table-table-html-using-table-generate-source)
(org-shiftcursor-error, org-ctrl-c-ctrl-c):
* textmodes/reftex.el (reftex-access-scan-info):
* textmodes/reftex-toc.el (reftex-toc-dframe-p)
(reftex-toc-promote-prepare): Follow error conventions.
* diff-mode.el (diff-mode): Fix typo in docstring.
* forms.el (forms--intuit-from-file): Fix reference to
`forms-number-of-fields' in error message.
(forms-print): Fix quoting in error message.
* forms.el (forms-mode):
* emulation/vi.el (vi-goto-insert-state):
* progmodes/flymake.el (flymake-new-err-info)
(flymake-start-syntax-check-for-current-buffer)
(flymake-simple-cleanup):
* eshell/esh-var.el (eshell/export):
* progmodes/gud.el (xdb):
* textmodes/flyspell.el (flyspell-incorrect-hook)
(flyspell-maybe-correct-transposition)
(flyspell-maybe-correct-doubling): Fix quoting in docstring.
2005-06-13 Luc Teirlinck <teirllm@auburn.edu>
* emacs-lisp/debug.el (cancel-debug-on-entry): Mention default in
minibuffer prompt.
2005-06-13 Kim F. Storm <storm@cua.dk>
* subr.el (add-to-ordered-list): New defun.
* emulation/cua-base.el (cua-mode): Use add-to-ordered-list to
add cua--keymap-alist to emulation-mode-map-alists.
2005-06-13 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (complete-in-turn): New macro.
(dynamic-completion-table, lazy-completion-table): Add debug info.
* faces.el (read-face-name): Use complete-in-turn complete non-aliases
in preference to face aliases.
* textmodes/fill.el (fill-match-adaptive-prefix): New function.
(fill-context-prefix): Use it to avoid guessing absurdly long prefixes.
Remove unused vars `start' and `firstline'.
(fill-nobreak-p): Fix line-move-invisible -> line-move-invisible-p.
(justify-current-line, fill-individual-paragraphs): Remove unused vars.
2005-06-13 Eli Zaretskii <eliz@gnu.org>
* cus-start.el (all): Don't complain about missing GTK-related
variables, unless either `gtk' is boundp or this isn't a
`windows-nt' build.
2005-06-13 Lute Kamstra <lute@gnu.org>
* abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
run-mode-hooks.
* ediff-mult.el (ediff-meta-mode):
* ediff-util.el (ediff-mode): Use run-mode-hooks.
* ledit.el (ledit-mode): Use delay-mode-hooks.
* woman.el (woman-mode-line-format): Delete constant.
(woman-mode-map): Initialize it properly.
(woman-mode): Set mode-class property to special.
Use delay-mode-hooks and run-mode-hooks. Use the right keymap.
Set major-mode and mode-name. Don't set mode-line-format directly.
(Man-getpage-in-background): Don't reference woman-mode-line-format.
* emacs-lisp/debug.el (cancel-debug-on-entry): Make the empty
string argument obsolete.
2005-06-13 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-CUA-compatible): New option.
(org-disputed-keys): New variable.
(org-key): New function.
(orgtbl-make-binding): Add docstring to the created function.
(org-mode): Set paragraph start/separate regexps.
(orgtbl-mode): Don't start `orgtbl-mode' in `org-mode' buffers.
(org-archive-location, org-archive-mark-done)
(org-archive-stamp-time): New options.
(org-archive-subtree): New command.
(org-fill-paragraph): New function.
(org-mode): Set `fill-paragraph-function' to `org-fill-paragraph'.
(org-fake-empty-table-line): Function removed.
(org-format-org-table-html): Do not create empty table lines at
separator lines. Improved table header treatment.
(org-link-format): New option.
(org-make-link): New function.
(org-insert-link, org-store-link): Use org-make-link.
(org-open-file): Quote file name for shell command, to allow
spaces in file names.
(org-link-regexp): Fix bug with mailto link.
(org-link-maybe-angles-regexp, org-protected-link-regexp):
New constants.
(org-export-as-html): Deal with the optional angles around a link.
Better treatment of file: links.
(org-open-at-point): Replace @{ and @} with < and >.
(org-run-mode-hooks): Function removed.
(org-agenda-mode): No longer use `org-run-mode-hooks'.
2005-06-13 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-registers-mode): Let gdbmi use
MI command -data-list-register-values.
(gdb-post-prompt): Indent properly.
2005-06-13 Juanma Barranquero <lekktu@gmail.com>
* hilit-chg.el (highlight-changes-colors): Rename from
`highlight-changes-colours'.
(highlight-changes-colours): Keep as obsolete alias.
(highlight-changes-face-list): Doc fix.
(hilit-chg-make-list): Use `highlight-changes-colors'.
2005-06-12 Mark A. Hershberger <mah@everybody.org>
* progmodes/cperl-mode.el (cperl-mode): Remove stray paren in
defun-prompt-regexp.
2005-06-12 Eli Zaretskii <eliz@gnu.org>
* loadup.el: Don't say we are dumping under 2 names on windows-nt
and cygwin.
* makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH):
Don't use an old loaddefs.el, as in Makefile.in.
2005-06-12 Lute Kamstra <lute@gnu.org>
* Makefile.in (bootstrap-prepare): Don't use an old loaddefs.el.
* man.el (Man-mode-map): Initialize it properly.
(Man-mode): Set mode-class property to special.
* calendar/calendar.el (calendar-mode): Use run-mode-hooks.
2005-06-11 Luc Teirlinck <teirllm@auburn.edu>
* menu-bar.el (menu-bar-make-toggle): Remove stray backslash.
A newline is needed in the docstring there.
* emacs-lisp/debug.el (debug-on-entry, cancel-debug-on-entry):
Doc fixes.
2005-06-11 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* printing.el: Doc fix. The menubar is no more changed when printing
is loaded, it only changes when pr-menu-bind or pr-update-menus is
called. Now, the menubar changing will work in Emacs 20, 21 and 22.
(pr-version): New version number (6.8.4).
(pr-menu-bind): New command.
(pr-update-menus): Docstring and code fix.
(pr-menu-print-item): Now is a global var in Emacs and XEmacs.
Docstring fix.
(pr-txt-printer-alist, pr-ps-printer-alist, pr-gv-command)
(pr-gs-command, pr-gs-switches, pr-ps-utility-alist): Docstring fix.
2005-06-11 Thien-Thi Nguyen <ttn@gnu.org>
* emacs-lisp/ewoc.el: Doc fixes for public funcs:
"Returns" to "return", document useful return values, etc.
2005-06-11 Alan Mackenzie <acm@muc.de>
* fill.el (fill-context-prefix): Try `adaptive-fill-function'
BEFORE `adaptive-fill-regexp' when determining a fill prefix.
(adaptive-file-function): Minor amendment to doc-string.
2005-06-11 Frederik Fouvry <fouvry@CoLi.Uni-SB.DE>
* thumbs.el (thumbs-per-line, thumbs-thumbsdir-max-size)
(thumbs-relief, thumbs-margin, thumbs-image-resizing-step):
Fix :type--it is `integer', not `string'.
* faces.el (modeline-highlight): Rename from (the erroneous)
`modeline-higilight'.
2005-06-11 Lute Kamstra <lute@gnu.org>
* emacs-lisp/edebug.el (edebug-eval-mode-map): Don't copy
lisp-interaction-mode-map but make it the parent.
(edebug-eval-mode): Use define-derived-mode.
2005-06-11 Andreas Schwab <schwab@suse.de>
* bindings.el: Add binding of `ESC functionkey' for every
`M-functionkey'.
* hexl.el (hexl-mode-map): Likewise.
2005-06-10 Michael Hotchin <michael@hotchin.net> (tiny change)
* progmodes/compile.el (compilation-error-regexp-alist-alist)
[msft]: update regexp for newer msft compilers.
2005-06-10 Mark A. Hershberger <mah@everybody.org>
* xml.el (start-chars, xml-parse-dtd): Add the ability to skip
ATTLIST portions of included DTDs.
(xml-parse-dtd): Eliminate use of inefficient match-data.
2005-06-10 Miles Bader <miles@gnu.org>
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text): Remove "-face" suffix from face names.
(mpuz-unsolved-face, mpuz-solved-face, mpuz-trivial-face)
(mpuz-text-face): New backward-compatibility aliases for renamed faces.
(mpuz-create-buffer, mpuz-paint-digit): Use renamed mpuz faces.
* play/gomoku.el (gomoku-O, gomoku-X):
Remove "-face" suffix from face names.
(gomoku-font-lock-O-face, gomoku-font-lock-X-face):
New backward-compatibility aliases for renamed faces.
(gomoku-font-lock-keywords): Use renamed gomoku faces.
2005-06-10 Juanma Barranquero <lekktu@gmail.com>
* thumbs.el: Fixes for changes of 2005-06-09.
(thumbs-thumbsdir): Force `thumbs-thumbsdir' to be interpretable
as a directory.
(thumbs-thumbname): Remove directory separator from format string;
`thumbs-thumbsdir' now returns a valid directory name.
(thumbs-temp-dir): New defsubst.
(thumbs-temp-file, thumbs-resize-image, thumbs-modify-image):
Use it.
* cus-edit.el (minibuffer):
* files.el (make-backup-file-name-function):
* filesets.el (filesets-external-viewers):
* hilit-chg.el (highlight-changes-colours)
(highlight-changes-face-list, highlight-changes-rotate-faces):
* ielm.el (ielm-dynamic-return, inferior-emacs-lisp-mode):
* kmacro.el (kmacro-call-macro):
* log-edit.el (log-edit-changelog-full-paragraphs):
* mouse.el (mouse-1-click-follows-link):
* skeleton.el (skeleton-autowrap):
* subr.el (insert-for-yank-1):
* tempo.el (tempo-insert-region):
* terminal.el (terminal-emulator):
* time.el (display-time-mail-face):
* vc.el (vc-annotate):
* vcursor.el (vcursor-copy-line):
* woman.el (woman-bold-headings, woman-ignore)
(woman-default-faces, woman-monochrome-faces):
* calendar/todo-mode.el (todo-insert-threshold):
* emulation/pc-select.el (pc-select-selection-keys-only)
(pc-selection-mode):
* emulation/vip.el (vip-find-char-forward):
* emulation/viper-cmd.el (viper-find-char-forward):
* international/mule-cmds.el (select-safe-coding-system-accept-default-p)
(input-method-exit-on-invalid-key):
* international/mule-diag.el (describe-coding-system):
* international/ucs-tables.el (unify-8859-on-encoding-mode):
* net/browse-url.el (browse-url-xterm-program):
* obsolete/lazy-lock.el (lazy-lock-mode):
* progmodes/cperl-mode.el (cperl-info-on-command-no-prompt)
(cperl-mode):
* progmodes/cpp.el (cpp-face-light-name-list)
(cpp-face-dark-name-list):
* progmodes/delphi.el (delphi-newline-always-indents):
Fix spellings in docstrings.
* ido.el (ido-mode, ido-file-extensions-order)
(ido-default-file-method, ido-default-buffer-method)
(ido-max-prospects, ido-slow-ftp-hosts, ido-setup-hook)
(ido-decorations, ido-read-file-name-as-directory-commands)
(ido-read-file-name-non-ido, ido-work-directory-list)
(ido-ignore-item-temp-list, ido-current-directory)
(ido-magic-forward-char, ido-enter-find-file)
(ido-enter-switch-buffer, ido-visit-buffer, ido-switch-buffer)
(ido-find-file, ido-read-buffer): Fix typos in docstrings.
2005-06-10 Lute Kamstra <lute@gnu.org>
* play/dunnet.el (dun-mode): Use define-derived-mode.
(dungeon-mode-map): Rename to dun-mode-map. Keep old name as an
obsolete alias.
* play/doctor.el (doctor-mode-map): Remove defvar.
(doctor-mode): Use define-derived-mode.
* mail/mspools.el (mspools-mode):
* net/eudc-hotlist.el (eudc-hotlist-mode):
* play/blackbox.el (blackbox-mode): Use run-mode-hooks.
2005-06-10 Miles Bader <miles@gnu.org>
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Remove "-face" suffix from face names.
(flyspell-incorrect-face, flyspell-duplicate-face):
New backward-compatibility aliases for renamed faces.
(flyspell-mode-on, make-flyspell-overlay)
(flyspell-highlight-incorrect-region)
(flyspell-highlight-duplicate-region)
(flyspell-display-next-corrections)
(flyspell-auto-correct-previous-word): Use renamed flyspell faces.
* textmodes/texinfo.el (texinfo-heading): Remove "-face" suffix
from face name.
(texinfo-heading-face): New backward-compatibility alias for
renamed face.
(texinfo-heading-face): Use renamed texinfo-heading face.
* textmodes/tex-mode.el (tex-math, tex-verbatim): Remove "-face"
suffix from face names.
(tex-math-face, tex-verbatim-face):
New backward-compatibility aliases for renamed faces.
(tex-math-face, tex-verbatim-face): Use renamed tex-mode faces.
(tex-insert-quote): Use `tex-verbatim-face' variable instead of
literal face name.
* textmodes/table.el (table-cell): Remove "-face" suffix from face
name.
(table-cell-face): New backward-compatibility alias for renamed face.
(table--put-cell-face-property, table--update-cell-face):
Use renamed table-cell face.
* textmodes/sgml-mode.el (sgml-namespace): Remove "-face" suffix
from face name.
(sgml-namespace-face): New backward-compatibility alias for
renamed face.
(sgml-namespace-face): Use renamed sgml-namespace face.
* textmodes/org.el (org-level-1, org-level-2, org-level-3)
(org-level-4, org-level-5, org-level-6, org-level-7)
(org-level-8, org-warning, org-headline-done)
(org-deadline-announce, org-scheduled-today)
(org-scheduled-previously, org-link, org-done, org-table)
(org-time-grid): Remove "-face" suffix from face names.
(org-level-1-face, org-level-2-face, org-level-3-face)
(org-level-4-face, org-level-5-face, org-level-6-face)
(org-level-7-face, org-level-8-face, org-warning-face)
(org-headline-done-face, org-deadline-announce-face)
(org-scheduled-today-face, org-scheduled-previously-face)
(org-link-face, org-done-face, org-table-face)
(org-time-grid-face):
New backward-compatibility aliases for renamed faces.
(org-level-faces, org-set-font-lock-defaults, org-timeline)
(org-agenda, org-agenda-get-todos, org-agenda-get-deadlines)
(org-agenda-get-timestamps, org-agenda-get-scheduled)
(org-agenda-add-time-grid-maybe, org-table-p): Use renamed org faces.
* emulation/viper-init.el (viper-search, viper-replace-overlay)
(viper-minibuffer-emacs, viper-minibuffer-insert)
(viper-minibuffer-vi): Remove "-face" suffix from face names.
(viper-search-face, viper-replace-overlay-face)
(viper-minibuffer-emacs-face, viper-minibuffer-insert-face)
(viper-minibuffer-vi-face):
New backward-compatibility aliases for renamed faces.
(viper-search-face, viper-replace-overlay-face)
(viper-minibuffer-emacs-face, viper-minibuffer-insert-face)
(viper-minibuffer-vi-face): Use renamed viper faces.
* emacs-lisp/testcover.el (testcover-nohits, testcover-1value):
Remove "-face" suffix from face names.
(testcover-nohits-face, testcover-1value-face):
New backward-compatibility aliases for renamed faces.
(testcover-mark): Use renamed testcover faces.
* calendar/diary-lib.el (diary-button): Remove "-face" suffix from
face name.
(diary-button-face): New backward-compatibility alias for renamed face.
(diary-entry): Use renamed diary-button face.
* calendar/calendar.el (diary, calendar-today, holiday)
(mark-visible-calendar-date): Remove "-face" suffix from face names.
(diary-face, calendar-today-face, holiday-face):
New backward-compatibility aliases for renamed faces.
(eval-after-load "facemenu", diary-entry-marker)
(calendar-today-marker, calendar-holiday-marker, diary-face):
Use renamed calendar faces.
* compare-w.el (compare-windows): Remove "-face" suffix from face name.
(compare-windows-face): New backward-compatibility alias for
renamed face.
(compare-windows-highlight): Use renamed compare-windows face.
* strokes.el (strokes-char): Remove "-face" suffix from face name.
(strokes-char-face): New backward-compatibility alias for renamed face.
(strokes-encode-buffer): Use renamed strokes-char face.
* pcvs-info.el (cvs-header, cvs-filename, cvs-unknown)
(cvs-handled, cvs-need-action, cvs-marked, cvs-msg):
Remove "-face" suffix from face names.
(cvs-header-face, cvs-filename-face, cvs-unknown-face)
(cvs-handled-face, cvs-need-action-face, cvs-marked-face)
(cvs-msg-face): New backward-compatibility aliases for renamed faces.
(cvs-fi-up-to-date-face, cvs-fi-unknown-face, cvs-fileinfo-pp):
Use renamed pcvs faces.
* pcvs.el (cvs-mode-find-file): Use renamed pcvs faces.
* pcvs-defs.el (cvs-mode-map): Likewise.
* cvs-status.el (cvs-status-font-lock-keywords): Likewise.
* info.el (info-title-1, info-title-2, info-title-3)
(info-title-4): Remove "-face" suffix from and downcase face names.
(Info-title-1-face, Info-title-2-face, Info-title-3-face)
(Info-title-4-face):
New backward-compatibility aliases for renamed faces.
(Info-fontify-node): Use renamed info faces.
* hilit-chg.el (highlight-changes, highlight-changes-delete):
Remove "-face" suffix from face names.
(highlight-changes-face, highlight-changes-delete-face):
New backward-compatibility aliases for renamed faces.
(hilit-chg-cust-fix-changes-face-list, hilit-chg-make-ov)
(hilit-chg-make-list): Use renamed highlight-changes faces.
* generic-x.el (show-tabs-tab, show-tabs-space):
Remove "-face" suffix from face names.
(show-tabs-tab-face, show-tabs-space-face):
New backward-compatibility aliases for renamed faces.
(show-tabs-generic-mode-font-lock-defaults-1)
(show-tabs-generic-mode-font-lock-defaults-2):
Use renamed show-tabs faces.
* smerge-mode.el (smerge-mine, smerge-other, smerge-base)
(smerge-markers): Remove "-face" suffix from face names.
(smerge-mine-face, smerge-other-face, smerge-base-face)
(smerge-markers-face):
New backward-compatibility aliases for renamed faces.
(smerge-mine-face, smerge-other-face, smerge-base-face)
(smerge-markers-face): Use renamed smerge faces.
* log-view.el (log-view-file, log-view-message):
Remove "-face" suffix from face names.
(log-view-file-face, log-view-message-face):
New backward-compatibility aliases for renamed faces.
(log-view-file-face, log-view-message-face): Use renamed log-view faces.
* paren.el (show-paren-match, show-paren-mismatch):
Remove "-face" suffix from face names.
(show-paren-match-face, show-paren-mismatch-face):
New backward-compatibility aliases for renamed faces.
(show-paren-function): Use renamed show-paren faces.
* ruler-mode.el (ruler-mode-default, ruler-mode-pad)
(ruler-mode-margins, ruler-mode-fringes)
(ruler-mode-column-number, ruler-mode-fill-column)
(ruler-mode-comment-column, ruler-mode-goal-column)
(ruler-mode-tab-stop, ruler-mode-current-column):
Remove "-face" suffix from face names.
(ruler-mode-default-face, ruler-mode-pad-face)
(ruler-mode-margins-face, ruler-mode-fringes-face)
(ruler-mode-column-number-face, ruler-mode-fill-column-face)
(ruler-mode-comment-column-face, ruler-mode-goal-column-face)
(ruler-mode-tab-stop-face, ruler-mode-current-column-face):
New backward-compatibility aliases for renamed faces.
(ruler-mode-pad, ruler-mode-margins, ruler-mode-fringes)
(ruler-mode-column-number, ruler-mode-fill-column)
(ruler-mode-comment-column, ruler-mode-goal-column)
(ruler-mode-tab-stop, ruler-mode-current-column)
(ruler-mode-mouse-grab-any-column, ruler-mode-ruler): Use renamed faces.
* whitespace.el (whitespace-highlight): Remove "-face" suffix from
face name.
(whitespace-highlight-the-space): Use renamed face.
(whitespace-highlight-face): New backward-compatibility alias for
renamed face.
* woman.el (woman-italic, woman-bold, woman-unknown)
(woman-addition, woman-symbol-face):
Remove "-face" suffix from face names.
(woman-italic-face, woman-bold-face, woman-unknown-face)
(woman-addition-face):
New backward-compatibility aliases for renamed faces.
(woman-default-faces, woman-monochrome-faces, woman-man-buffer)
(woman-decode-region, woman-replace-match)
(woman-display-extended-fonts, woman-special-characters)
(woman-font-alist, woman-change-fonts, woman2-TH, woman2-SH):
Use renamed woman faces.
* longlines.el (longlines-visible-face): Face removed.
* diff-mode.el (diff-header, diff-file-header, diff-index)
(diff-hunk-header, diff-removed, diff-added, diff-changed)
(diff-function, diff-context, diff-nonexistent): Remove "-face"
suffix from face names.
(diff-header-face, diff-file-header-face, diff-index-face)
(diff-hunk-header-face, diff-removed-face, diff-added-face)
(diff-changed-face, diff-function-face, diff-context-face)
(diff-nonexistent-face): New backward-compatibility aliases for
renamed faces.
(diff-header-face, diff-file-header-face)
(diff-index, diff-index-face, diff-hunk-header)
(diff-hunk-header-face, diff-removed, diff-removed-face)
(diff-added, diff-added-face, diff-changed-face, diff-function)
(diff-function-face, diff-context-face, diff-nonexistent)
(diff-nonexistent-face): Use renamed diff-mode faces.
* progmodes/compile.el (compilation-warning-face)
(compilation-info-face): Remove "-face" suffix from face names.
(compilation-warning-face, compilation-info-face):
New backward-compatibility aliases for renamed faces.
(compilation-warning-face, compilation-info-face):
Use renamed compilation faces.
* add-log.el (change-log-date, change-log-name)
(change-log-email, change-log-file, change-log-list)
(change-log-conditionals, change-log-function)
(change-log-acknowledgement): Remove "-face" suffix from face names.
(change-log-date-face, change-log-name-face)
(change-log-email-face, change-log-file-face)
(change-log-list-face, change-log-conditionals-face)
(change-log-function-face, change-log-acknowledgement-face):
New backward-compatibility aliases for renamed faces.
(change-log-font-lock-keywords): Use renamed change-log faces.
* cus-edit.el (custom-invalid, custom-rogue, custom-modified)
(custom-set, custom-changed, custom-saved, custom-button)
(custom-button-pressed, custom-documentation, custom-state)
(custom-comment, custom-comment-tag, custom-variable-tag)
(custom-variable-button, custom-face-tag, custom-group-tag-1)
(custom-group-tag): Remove "-face" suffix from face names.
(custom-magic-alist, custom-magic-value-create)
(custom-group-sample-face-get, custom-mode): Use renamed custom faces.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face):
New backward-compatibility aliases for renamed faces.
* wid-edit.el (widget-documentation, widget-button)
(widget-field, widget-single-line-field, widget-inactive)
(widget-button-pressed): "-face" suffix removed from face names.
(widget-documentation-face, widget-button-face)
(widget-field-face, widget-single-line-field-face)
(widget-inactive-face, widget-button-pressed-face):
New backward-compatibility aliases for renamed faces.
(widget-documentation-face, widget-button-face)
(widget-button-pressed-face, widget-specify-field)
(widget-specify-inactive): Use renamed widget faces.
2005-06-10 Kenichi Handa <handa@m17n.org>
* term/x-win.el (x-clipboard-yank): Remove condition-case
wrapping.
2005-06-11 Kenichi Handa <handa@m17n.org>
* add-log.el (change-log-font-lock-keywords): Make the regexp for
date lines stricter.
2005-06-10 Zhang Wei <id.brep@gmail.com> (tiny change)
* term/x-win.el (x-clipboard-yank): Use x-selection-value instead
of x-get-selection.
2005-06-10 Juanma Barranquero <lekktu@gmail.com>
* comint.el (comint-mode, comint-snapshot-last-prompt):
* frame.el (frame-current-scroll-bars):
* term.el (term-mode, term-check-proc, term-input-sender)
(term-simple-send, term-extract-string, term-word)
(term-match-partial-filename):
* window.el (window-current-scroll-bars):
* emulation/cua-base.el (cua-normal-cursor-color)
(cua-read-only-cursor-color, cua-overwrite-cursor-color)
(cua-global-mark-cursor-color):
* mail/undigest.el (rmail-forward-separator-regex):
Fix typos in docstrings.
* comint.el (comint-check-proc, make-comint-in-buffer)
(comint-source-default): Doc fixes.
* term.el (term-send-string): Improve argument/docstring
consistency.
2005-06-09 Luc Teirlinck <teirllm@auburn.edu>
* comint.el (comint-send-input): Bind `inhibit-read-only' around
call to `delete-region'.
(comint-mode-hook): Do not enable Font Lock by default.
2005-06-09 Lute Kamstra <lute@gnu.org>
* textmodes/ispell.el (ispell-menu-map-needed): flyspell-mode
could be void.
2005-06-09 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/debug.el (debugger-will-be-back): New var.
@ -9,6 +812,9 @@
2005-06-09 Juanma Barranquero <lekktu@gmail.com>
* window.el (shrink-window-if-larger-than-buffer)
(window-size-fixed): Fix typo in docstring.
* thumbs.el: Don't set `auto-image-file-mode'. Do not create the
thumbnails directory on loading.
(thumbs-conversion-program): Use `eq' to check the system type,
@ -9719,7 +10525,7 @@
* toolbar/tool-bar.el (tool-bar-setup): Tool bar item dired uses
icon diropen. New tool bar item find-file-existing uses icon open.
* dired.el (dired-read-dir-and-switches): Call read-driectory-name
* dired.el (dired-read-dir-and-switches): Call read-directory-name
instead of read-file-name.
2004-11-02 Ulf Jasper <ulf.jasper@web.de>
@ -17838,8 +18644,8 @@
2004-01-21 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* term/x-win.el: Call menu-bar-enable-clipboard and make Paste
use clipboard first.
* term/x-win.el (x-clipboard-yank, menu-bar-edit-menu): Call
menu-bar-enable-clipboard and make Paste use clipboard first.
2004-01-20 Stefan Monnier <monnier@iro.umontreal.ca>

18
lisp/Makefile.in
View file

@ -217,21 +217,19 @@ $(lisp)/progmodes/cc-mode.elc: \
# Prepare a bootstrap in the lisp subdirectory.
#
# Build loaddefs.el, because it's not sure it's up-to-date, and if it's not,
# that might lead to errors during the bootstrap because something fails to
# autoload as expected. However, if there is no emacs binary, then we can't
# build autoloads yet, so just make sure there's some loaddefs.el file, as
# it's necessary for generating the binary (because loaddefs.el is an
# automatically generated file, we don't want to store it in the source
# repository).
# Build loaddefs.el to make sure it's up-to-date. If it's not, that
# might lead to errors during the bootstrap because something fails to
# autoload as expected. If there is no emacs binary, then we can't
# build autoloads yet. In that case we have to use ldefs-boot.el;
# bootstrap should always work with ldefs-boot.el. (Because
# loaddefs.el is an automatically generated file, we don't want to
# store it in the source repository).
bootstrap-prepare:
if test -x $(EMACS); then \
$(MAKE) $(MFLAGS) autoloads; \
else \
if test ! -r $(lisp)/loaddefs.el; then \
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \
fi \
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \
fi
maintainer-clean: distclean

4
lisp/abbrev.el
View file

@ -134,9 +134,11 @@ Otherwise display all abbrevs."
"Major mode for editing the list of abbrev definitions.
\\{edit-abbrevs-map}"
(interactive)
(kill-all-local-variables)
(setq major-mode 'edit-abbrevs-mode)
(setq mode-name "Edit-Abbrevs")
(use-local-map edit-abbrevs-map))
(use-local-map edit-abbrevs-map)
(run-mode-hooks 'edit-abbrevs-mode-hook))
(defun edit-abbrevs ()
"Alter abbrev definitions by editing a list of them.

56
lisp/add-log.el
View file

@ -166,86 +166,102 @@ Note: The search is conducted only within 10%, at the beginning of the file."
:type '(repeat regexp)
:group 'change-log)
(defface change-log-date-face
(defface change-log-date
'((t (:inherit font-lock-string-face)))
"Face used to highlight dates in date lines."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-date-face 'face-alias 'change-log-date)
(defface change-log-name-face
(defface change-log-name
'((t (:inherit font-lock-constant-face)))
"Face for highlighting author names."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-name-face 'face-alias 'change-log-name)
(defface change-log-email-face
(defface change-log-email
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting author email addresses."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-email-face 'face-alias 'change-log-email)
(defface change-log-file-face
(defface change-log-file
'((t (:inherit font-lock-function-name-face)))
"Face for highlighting file names."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-file-face 'face-alias 'change-log-file)
(defface change-log-list-face
(defface change-log-list
'((t (:inherit font-lock-keyword-face)))
"Face for highlighting parenthesized lists of functions or variables."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-list-face 'face-alias 'change-log-list)
(defface change-log-conditionals-face
(defface change-log-conditionals
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting conditionals of the form `[...]'."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-conditionals-face 'face-alias 'change-log-conditionals)
(defface change-log-function-face
(defface change-log-function
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting items of the form `<....>'."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-function-face 'face-alias 'change-log-function)
(defface change-log-acknowledgement-face
(defface change-log-acknowledgement
'((t (:inherit font-lock-comment-face)))
"Face for highlighting acknowledgments."
:version "21.1"
:group 'change-log)
;; backward-compatibility alias
(put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement)
(defvar change-log-font-lock-keywords
'(;;
;; Date lines, new and old styles.
("^\\sw.........[0-9:+ ]*"
(0 'change-log-date-face)
(0 'change-log-date)
;; Name and e-mail; some people put e-mail in parens, not angles.
("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
(1 'change-log-name-face)
(2 'change-log-email-face)))
(1 'change-log-name)
(2 'change-log-email)))
;;
;; File names.
("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)"
(2 'change-log-file-face)
(2 'change-log-file)
;; Possibly further names in a list:
("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face))
("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file))
;; Possibly a parenthesized list of names:
("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
nil nil (1 'change-log-list-face))
nil nil (1 'change-log-list))
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
nil nil (1 'change-log-list-face)))
nil nil (1 'change-log-list)))
;;
;; Function or variable names.
("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
(2 'change-log-list-face)
(2 'change-log-list)
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
(1 'change-log-list-face)))
(1 'change-log-list)))
;;
;; Conditionals.
("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals-face))
("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals))
;;
;; Function of change.
("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face))
("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function))
;;
;; Acknowledgements.
;; Don't include plain "From" because that is vague;
@ -254,7 +270,7 @@ Note: The search is conducted only within 10%, at the beginning of the file."
;; is to put the name of the author of the changes at the top
;; of the change log entry.
("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
3 'change-log-acknowledgement-face))
3 'change-log-acknowledgement))
"Additional expressions to highlight in Change Log mode.")
(defvar change-log-mode-map

25
lisp/bindings.el
View file

@ -745,6 +745,7 @@ language you are using."
(define-key global-map [home] 'beginning-of-line)
(define-key global-map [C-home] 'beginning-of-buffer)
(define-key global-map [M-home] 'beginning-of-buffer-other-window)
(define-key esc-map [home] 'beginning-of-buffer-other-window)
(define-key global-map [left] 'backward-char)
(define-key global-map [up] 'previous-line)
(define-key global-map [right] 'forward-char)
@ -757,13 +758,17 @@ language you are using."
(put 'scroll-left 'disabled t)
(define-key global-map [C-next] 'scroll-left)
(define-key global-map [M-next] 'scroll-other-window)
(define-key esc-map [next] 'scroll-other-window)
(define-key global-map [M-prior] 'scroll-other-window-down)
(define-key esc-map [prior] 'scroll-other-window-down)
(define-key esc-map [?\C-\S-v] 'scroll-other-window-down)
(define-key global-map [end] 'end-of-line)
(define-key global-map [C-end] 'end-of-buffer)
(define-key global-map [M-end] 'end-of-buffer-other-window)
(define-key esc-map [end] 'end-of-buffer-other-window)
(define-key global-map [begin] 'beginning-of-buffer)
(define-key global-map [M-begin] 'beginning-of-buffer-other-window)
(define-key esc-map [begin] 'beginning-of-buffer-other-window)
;; (define-key global-map [select] 'function-key-error)
;; (define-key global-map [print] 'function-key-error)
(define-key global-map [execute] 'execute-extended-command)
@ -927,7 +932,9 @@ language you are using."
(define-key global-map "\C-c" 'mode-specific-command-prefix)
(global-set-key [M-right] 'forward-word)
(define-key esc-map [right] 'forward-word)
(global-set-key [M-left] 'backward-word)
(define-key esc-map [left] 'backward-word)
;; ilya@math.ohio-state.edu says these bindings are standard on PC editors.
(global-set-key [C-right] 'forward-word)
(global-set-key [C-left] 'backward-word)
@ -937,12 +944,18 @@ language you are using."
;; This is "move to the clipboard", or as close as we come.
(global-set-key [S-delete] 'kill-region)
(global-set-key [C-M-left] 'backward-sexp)
(global-set-key [C-M-right] 'forward-sexp)
(global-set-key [C-M-up] 'backward-up-list)
(global-set-key [C-M-down] 'down-list)
(global-set-key [C-M-home] 'beginning-of-defun)
(global-set-key [C-M-end] 'end-of-defun)
(global-set-key [C-M-left] 'backward-sexp)
(define-key esc-map [C-left] 'backward-sexp)
(global-set-key [C-M-right] 'forward-sexp)
(define-key esc-map [C-right] 'forward-sexp)
(global-set-key [C-M-up] 'backward-up-list)
(define-key esc-map [C-up] 'backward-up-list)
(global-set-key [C-M-down] 'down-list)
(define-key esc-map [C-down] 'down-list)
(global-set-key [C-M-home] 'beginning-of-defun)
(define-key esc-map [C-home] 'beginning-of-defun)
(global-set-key [C-M-end] 'end-of-defun)
(define-key esc-map [C-end] 'end-of-defun)
(define-key esc-map "\C-f" 'forward-sexp)
(define-key esc-map "\C-b" 'backward-sexp)

6
lisp/buff-menu.el
View file

@ -74,11 +74,13 @@
:type 'boolean
:group 'Buffer-menu)
(defface Buffer-menu-buffer-face
(defface Buffer-menu-buffer
'((t (:weight bold)))
"Face used to highlight buffer name."
:group 'Buffer-menu
:group 'font-lock-highlighting-faces)
;; backward-compatibility alias
(put 'Buffer-menu-buffer-face 'face-alias 'Buffer-menu-buffer)
(defcustom Buffer-menu-buffer+size-width 26
"*How wide to jointly make the buffer name and size columns."
@ -773,7 +775,7 @@ For more information, see the function `buffer-menu'."
(int-to-string (nth 3 buffer))
`(buffer-name ,(nth 2 buffer)
buffer ,(car buffer)
font-lock-face Buffer-menu-buffer-face
font-lock-face Buffer-menu-buffer
mouse-face highlight
help-echo "mouse-2: select this buffer"))
" "

32
lisp/calendar/calendar.el
View file

@ -206,9 +206,9 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
:type 'boolean
:group 'view)
(defvar diary-face 'diary-face
(defvar diary-face 'diary
"Face name to use for diary entries.")
(defface diary-face
(defface diary
'((((min-colors 88) (class color) (background light))
:foreground "red1")
(((class color) (background light))
@ -221,13 +221,17 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
:weight bold))
"Face for highlighting diary entries."
:group 'diary)
;; backward-compatibility alias
(put 'diary-face 'face-alias 'diary)
(defface calendar-today-face
(defface calendar-today
'((t (:underline t)))
"Face for indicating today's date."
:group 'diary)
;; backward-compatibility alias
(put 'calendar-today-face 'face-alias 'calendar-today)
(defface holiday-face
(defface holiday
'((((class color) (background light))
:background "pink")
(((class color) (background dark))
@ -236,17 +240,19 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
:inverse-video t))
"Face for indicating dates that have holidays."
:group 'diary)
;; backward-compatibility alias
(put 'holiday-face 'face-alias 'holiday)
(eval-after-load "facemenu"
'(progn
(add-to-list 'facemenu-unlisted-faces 'diary-face)
(add-to-list 'facemenu-unlisted-faces 'calendar-today-face)
(add-to-list 'facemenu-unlisted-faces 'holiday-face)))
(add-to-list 'facemenu-unlisted-faces 'diary)
(add-to-list 'facemenu-unlisted-faces 'calendar-today)
(add-to-list 'facemenu-unlisted-faces 'holiday)))
(defcustom diary-entry-marker
(if (not (display-color-p))
"+"
'diary-face)
'diary)
"*How to mark dates that have diary entries.
The value can be either a single-character string or a face."
:type '(choice string face)
@ -255,7 +261,7 @@ The value can be either a single-character string or a face."
(defcustom calendar-today-marker
(if (not (display-color-p))
"="
'calendar-today-face)
'calendar-today)
"*How to mark today's date in the calendar.
The value can be either a single-character string or a face.
Marking today's date is done only if you set up `today-visible-calendar-hook'
@ -266,7 +272,7 @@ to request that."
(defcustom calendar-holiday-marker
(if (not (display-color-p))
"*"
'holiday-face)
'holiday)
"*How to mark notable dates in the calendar.
The value can be either a single-character string or a face."
:type '(choice string face)
@ -2441,7 +2447,6 @@ For a complete description, type \
\\<calendar-mode-map>\\[calendar-goto-info-node] from within the calendar.
\\<calendar-mode-map>\\{calendar-mode-map}"
(kill-all-local-variables)
(setq major-mode 'calendar-mode)
(setq mode-name "Calendar")
@ -2454,7 +2459,8 @@ For a complete description, type \
(make-local-variable 'displayed-month);; Month in middle of window.
(make-local-variable 'displayed-year) ;; Year in middle of window.
(set (make-local-variable 'font-lock-defaults)
'(calendar-font-lock-keywords t)))
'(calendar-font-lock-keywords t))
(run-mode-hooks 'calendar-mode-hook))
(defun calendar-string-spread (strings char length)
"Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH.
@ -2943,7 +2949,7 @@ MARK defaults to `diary-entry-marker'."
(forward-char -2))
(let ; attr list
((temp-face
(make-symbol (apply 'concat "temp-face-"
(make-symbol (apply 'concat "temp-"
(mapcar '(lambda (sym)
(cond ((symbolp sym) (symbol-name sym))
((numberp sym) (int-to-string sym))

8
lisp/calendar/diary-lib.el
View file

@ -543,15 +543,17 @@ changing the variable `diary-include-string'."
(set-window-start window (point-min))))
(message "Preparing diary...done"))))
(defface diary-button-face '((((type pc) (class color))
(:foreground "lightblue")))
(defface diary-button '((((type pc) (class color))
(:foreground "lightblue")))
"Default face used for buttons."
:version "22.1"
:group 'diary)
;; backward-compatibility alias
(put 'diary-button-face 'face-alias 'diary-button)
(define-button-type 'diary-entry
'action #'diary-goto-entry
'face #'diary-button-face)
'face 'diary-button)
(defun diary-goto-entry (button)
(let ((marker (button-get button 'marker)))

2
lisp/calendar/todo-mode.el
View file

@ -311,7 +311,7 @@ which it will stop. If you set the threshhold to zero, the upper and
lower bound will coincide at the end of the loop and you will insert
your item just before that point. If you set the threshhold to,
e.g. 8, it will stop as soon as the window size drops below that
amount and will insert the item in the approximate centre of that
amount and will insert the item in the approximate center of that
window."
:type 'integer
:group 'todo)

20
lisp/comint.el
View file

@ -423,7 +423,7 @@ field boundaries in a natural way)."
(make-obsolete-variable 'comint-use-prompt-regexp-instead-of-fields
'comint-use-prompt-regexp "22.1")
(defcustom comint-mode-hook '(turn-on-font-lock)
(defcustom comint-mode-hook nil
"Hook run upon entry to `comint-mode'.
This is run before the process is cranked up."
:type 'hook
@ -583,7 +583,7 @@ Return not at end copies rest of line to end and sends it.
Setting variable `comint-eol-on-send' means jump to the end of the line
before submitting new input.
This mode is customised to create major modes such as Inferior Lisp
This mode is customized to create major modes such as Inferior Lisp
mode, Shell mode, etc. This can be done by setting the hooks
`comint-input-filter-functions', `comint-input-filter', `comint-input-sender'
and `comint-get-old-input' to appropriate functions, and the variable
@ -654,7 +654,7 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
(set (make-local-variable 'next-line-add-newlines) nil))
(defun comint-check-proc (buffer)
"Return t if there is a living process associated w/buffer BUFFER.
"Return non-nil if there is a living process associated w/buffer BUFFER.
Living means the status is `open', `run', or `stop'.
BUFFER can be either a buffer or the name of one."
(let ((proc (get-buffer-process buffer)))
@ -667,7 +667,7 @@ If BUFFER is nil, it defaults to NAME surrounded by `*'s.
PROGRAM should be either a string denoting an executable program to create
via `start-process', or a cons pair of the form (HOST . SERVICE) denoting a TCP
connection to be opened via `open-network-stream'. If there is already a
running process in that buffer, it is not restarted. Optional third arg
running process in that buffer, it is not restarted. Optional fourth arg
STARTFILE is the name of a file to send the contents of to the process.
If PROGRAM is a string, any more args are arguments to PROGRAM."
@ -1547,8 +1547,12 @@ Similarly for Soar, Scheme, etc."
nil comint-last-input-start comint-last-input-end
nil comint-last-input-end
(+ comint-last-input-end echo-len))))
(delete-region comint-last-input-end
(+ comint-last-input-end echo-len)))))
;; Certain parts of the text to be deleted may have
;; been mistaken for prompts. We have to prevent
;; problems when `comint-prompt-read-only' is non-nil.
(let ((inhibit-read-only t))
(delete-region comint-last-input-end
(+ comint-last-input-end echo-len))))))
;; This used to call comint-output-filter-functions,
;; but that scrolled the buffer in undesirable ways.
@ -1579,7 +1583,7 @@ See `comint-carriage-motion' for details.")
(defun comint-snapshot-last-prompt ()
"`snapshot' any current `comint-last-prompt-overlay'.
freeze its attributes in place, even when more input comes a long
Freeze its attributes in place, even when more input comes along
and moves the prompt overlay."
(when comint-last-prompt-overlay
(let ((inhibit-read-only t)
@ -2385,7 +2389,7 @@ updated using `comint-update-fence', if necessary."
"Compute the defaults for `load-file' and `compile-file' commands.
PREVIOUS-DIR/FILE is a pair (directory . filename) from the last
source-file processing command. nil if there hasn't been one yet.
source-file processing command, or nil if there hasn't been one yet.
SOURCE-MODES is a list used to determine what buffers contain source
files: if the major mode of the buffer is in SOURCE-MODES, it's source.
Typically, (lisp-mode) or (scheme-mode).

10
lisp/compare-w.el
View file

@ -1,6 +1,6 @@
;;; compare-w.el --- compare text between windows for Emacs
;; Copyright (C) 1986,1989,1993,1997,2003,2004 Free Software Foundation, Inc.
;; Copyright (C) 1986,1989,1993,1997,2003,2004,2005 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience files
@ -116,7 +116,7 @@ and the value `((4) (4))' for horizontally split windows."
:type 'boolean
:group 'compare-w)
(defface compare-windows-face
(defface compare-windows
'((((class color) (min-colors 88) (background light))
(:background "paleturquoise"))
(((class color) (min-colors 88) (background dark))
@ -126,6 +126,8 @@ and the value `((4) (4))' for horizontally split windows."
(t (:underline t)))
"Face for highlighting of compare-windows difference regions."
:group 'compare-w)
;; backward-compatibility alias
(put 'compare-windows-face 'face-alias 'compare-windows)
(defvar compare-windows-overlay1 nil)
(defvar compare-windows-overlay2 nil)
@ -341,13 +343,13 @@ on third call it again advances points to the next difference and so on."
(if compare-windows-overlay1
(move-overlay compare-windows-overlay1 beg1 end1 b1)
(setq compare-windows-overlay1 (make-overlay beg1 end1 b1))
(overlay-put compare-windows-overlay1 'face 'compare-windows-face)
(overlay-put compare-windows-overlay1 'face 'compare-windows)
(overlay-put compare-windows-overlay1 'priority 1))
(overlay-put compare-windows-overlay1 'window w1)
(if compare-windows-overlay2
(move-overlay compare-windows-overlay2 beg2 end2 b2)
(setq compare-windows-overlay2 (make-overlay beg2 end2 b2))
(overlay-put compare-windows-overlay2 'face 'compare-windows-face)
(overlay-put compare-windows-overlay2 'face 'compare-windows)
(overlay-put compare-windows-overlay2 'priority 1))
(overlay-put compare-windows-overlay2 'window w2)
;; Remove highlighting before next command is executed

168
lisp/cus-edit.el
View file

@ -417,7 +417,7 @@
:group 'development)
(defgroup minibuffer nil
"Controling the behaviour of the minibuffer."
"Controling the behavior of the minibuffer."
:link '(custom-manual "(emacs)Minibuffer")
:group 'environment)
@ -1636,50 +1636,62 @@ item in another window.\n\n"))
:group 'custom-faces
:group 'custom-buffer)
(defface custom-invalid-face '((((class color))
(:foreground "yellow1" :background "red1"))
(t
(:weight bold :slant italic :underline t)))
(defface custom-invalid '((((class color))
(:foreground "yellow1" :background "red1"))
(t
(:weight bold :slant italic :underline t)))
"Face used when the customize item is invalid."
:group 'custom-magic-faces)
;; backward-compatibility alias
(put 'custom-invalid-face 'face-alias 'custom-invalid)
(defface custom-rogue-face '((((class color))
(:foreground "pink" :background "black"))
(t
(:underline t)))
(defface custom-rogue '((((class color))
(:foreground "pink" :background "black"))
(t
(:underline t)))
"Face used when the customize item is not defined for customization."
:group 'custom-magic-faces)
;; backward-compatibility alias
(put 'custom-rogue-face 'face-alias 'custom-rogue)
(defface custom-modified-face '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
(((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic :bold)))
(defface custom-modified '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
(((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic :bold)))
"Face used when the customize item has been modified."
:group 'custom-magic-faces)
;; backward-compatibility alias
(put 'custom-modified-face 'face-alias 'custom-modified)
(defface custom-set-face '((((min-colors 88) (class color))
(:foreground "blue1" :background "white"))
(((class color))
(:foreground "blue" :background "white"))
(t
(:slant italic)))
(defface custom-set '((((min-colors 88) (class color))
(:foreground "blue1" :background "white"))
(((class color))
(:foreground "blue" :background "white"))
(t
(:slant italic)))
"Face used when the customize item has been set."
:group 'custom-magic-faces)
;; backward-compatibility alias
(put 'custom-set-face 'face-alias 'custom-set)
(defface custom-changed-face '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
(((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic)))
(defface custom-changed '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
(((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic)))
"Face used when the customize item has been changed."
:group 'custom-magic-faces)
;; backward-compatibility alias
(put 'custom-changed-face 'face-alias 'custom-changed)
(defface custom-saved-face '((t (:underline t)))
(defface custom-saved '((t (:underline t)))
"Face used when the customize item has been saved."
:group 'custom-magic-faces)
;; backward-compatibility alias
(put 'custom-saved-face 'face-alias 'custom-saved)
(defconst custom-magic-alist
'((nil "#" underline "\
@ -1689,21 +1701,21 @@ UNKNOWN, you should not see this.")
(hidden "-" default "\
HIDDEN, invoke \"Show\" in the previous line to show." "\
group now hidden, invoke \"Show\", above, to show contents.")
(invalid "x" custom-invalid-face "\
(invalid "x" custom-invalid "\
INVALID, the displayed value cannot be set.")
(modified "*" custom-modified-face "\
(modified "*" custom-modified "\
EDITED, shown value does not take effect until you set or save it." "\
something in this group has been edited but not set.")
(set "+" custom-set-face "\
(set "+" custom-set "\
SET for current session only." "\
something in this group has been set but not saved.")
(changed ":" custom-changed-face "\
(changed ":" custom-changed "\
CHANGED outside Customize; operating on it here may be unreliable." "\
something in this group has been changed outside customize.")
(saved "!" custom-saved-face "\
(saved "!" custom-saved "\
SAVED and set." "\
something in this group has been set and saved.")
(rogue "@" custom-rogue-face "\
(rogue "@" custom-rogue "\
NO CUSTOMIZATION DATA; you should not see this." "\
something in this group is not prepared for customization.")
(standard " " nil "\
@ -1830,7 +1842,7 @@ and `face'."
(insert " (lisp)"))
((eq form 'mismatch)
(insert " (mismatch)")))
(put-text-property start (point) 'face 'custom-state-face))
(put-text-property start (point) 'face 'custom-state))
(insert "\n"))
(when (and (eq category 'group)
(not (and (eq custom-buffer-style 'links)
@ -1864,7 +1876,7 @@ and `face'."
;;; The `custom' Widget.
(defface custom-button-face
(defface custom-button
'((((type x w32 mac) (class color)) ; Like default modeline
(:box (:line-width 2 :style released-button)
:background "lightgrey" :foreground "black"))
@ -1873,8 +1885,10 @@ and `face'."
"Face used for buttons in customization buffers."
:version "21.1"
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-button-face 'face-alias 'custom-button)
(defface custom-button-pressed-face
(defface custom-button-pressed
'((((type x w32 mac) (class color))
(:box (:line-width 2 :style pressed-button)
:background "lightgrey" :foreground "black"))
@ -1883,20 +1897,26 @@ and `face'."
"Face used for buttons in customization buffers."
:version "21.1"
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-button-pressed-face 'face-alias 'custom-button-pressed)
(defface custom-documentation-face nil
(defface custom-documentation nil
"Face used for documentation strings in customization buffers."
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-documentation-face 'face-alias 'custom-documentation)
(defface custom-state-face '((((class color)
(background dark))
(:foreground "lime green"))
(((class color)
(background light))
(:foreground "dark green"))
(t nil))
(defface custom-state '((((class color)
(background dark))
(:foreground "lime green"))
(((class color)
(background light))
(:foreground "dark green"))
(t nil))
"Face used for State descriptions in the customize buffer."
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-state-face 'face-alias 'custom-state)
(define-widget 'custom 'default
"Customize a user option."
@ -2092,20 +2112,22 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
;;; The `custom-comment' Widget.
;; like the editable field
(defface custom-comment-face '((((class grayscale color)
(background light))
(:background "gray85"))
(((class grayscale color)
(background dark))
(:background "dim gray"))
(t
(:slant italic)))
(defface custom-comment '((((class grayscale color)
(background light))
(:background "gray85"))
(((class grayscale color)
(background dark))
(:background "dim gray"))
(t
(:slant italic)))
"Face used for comments on variables or faces"
:version "21.1"
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-comment-face 'face-alias 'custom-comment)
;; like font-lock-comment-face
(defface custom-comment-tag-face
(defface custom-comment-tag
'((((class color) (background dark)) (:foreground "gray80"))
(((class color) (background light)) (:foreground "blue4"))
(((class grayscale) (background light))
@ -2115,6 +2137,8 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
(t (:weight bold)))
"Face used for variables or faces comment tags"
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-comment-tag-face 'face-alias 'custom-comment-tag)
(define-widget 'custom-comment 'string
"User comment."
@ -2154,7 +2178,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
;; When this was underlined blue, users confused it with a
;; Mosaic-style hyperlink...
(defface custom-variable-tag-face
(defface custom-variable-tag
`((((class color)
(background dark))
(:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
@ -2163,14 +2187,18 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
(:foreground "blue1" :weight bold :height 1.2 :inherit variable-pitch))
(((class color)
(background light))
(:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
(:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
(t (:weight bold)))
"Face used for unpushable variable tags."
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-variable-tag-face 'face-alias 'custom-variable-tag)
(defface custom-variable-button-face '((t (:underline t :weight bold)))
(defface custom-variable-button '((t (:underline t :weight bold)))
"Face used for pushable variable tags."
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-variable-button-face 'face-alias 'custom-variable-button)
(defcustom custom-variable-default-form 'edit
"Default form of displaying variable values."
@ -2874,10 +2902,12 @@ Only match frames that support the specified face attributes.")
;;; The `custom-face' Widget.
(defface custom-face-tag-face
(defface custom-face-tag
`((t (:weight bold :height 1.2 :inherit variable-pitch)))
"Face used for face tags."
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-face-tag-face 'face-alias 'custom-face-tag)
(defcustom custom-face-default-form 'selected
"Default form of displaying face definition."
@ -3396,12 +3426,11 @@ restoring it to the state of a face that has never been customized."
;; Fixme: make it do so in Emacs.
"Face used for group tags.
The first member is used for level 1 groups, the second for level 2,
and so forth. The remaining group tags are shown with
`custom-group-tag-face'."
and so forth. The remaining group tags are shown with `custom-group-tag'."
:type '(repeat face)
:group 'custom-faces)
(defface custom-group-tag-face-1
(defface custom-group-tag-1
`((((class color)
(background dark))
(:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
@ -3414,8 +3443,10 @@ and so forth. The remaining group tags are shown with
(t (:weight bold)))
"Face used for group tags."
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-group-tag-face-1 'face-alias 'custom-group-tag-1)
(defface custom-group-tag-face
(defface custom-group-tag
`((((class color)
(background dark))
(:foreground "light blue" :weight bold :height 1.2))
@ -3428,6 +3459,8 @@ and so forth. The remaining group tags are shown with
(t (:weight bold)))
"Face used for low level group tags."
:group 'custom-faces)
;; backward-compatibility alias
(put 'custom-group-tag-face 'face-alias 'custom-group-tag)
(define-widget 'custom-group 'custom
"Customize group."
@ -3448,7 +3481,7 @@ and so forth. The remaining group tags are shown with
(defun custom-group-sample-face-get (widget)
;; Use :sample-face.
(or (nth (1- (widget-get widget :custom-level)) custom-group-tag-faces)
'custom-group-tag-face))
'custom-group-tag))
(define-widget 'custom-group-visibility 'visibility
"An indicator and manipulator for hidden group contents."
@ -4261,13 +4294,12 @@ if that value is non-nil."
(make-local-variable 'custom-options)
(make-local-variable 'custom-local-buffer)
(make-local-variable 'widget-documentation-face)
(setq widget-documentation-face 'custom-documentation-face)
(setq widget-documentation-face 'custom-documentation)
(make-local-variable 'widget-button-face)
(setq widget-button-face 'custom-button-face)
(set (make-local-variable 'widget-button-pressed-face)
'custom-button-pressed-face)
(setq widget-button-face 'custom-button)
(set (make-local-variable 'widget-button-pressed-face) 'custom-button-pressed)
(set (make-local-variable 'widget-mouse-face)
'custom-button-pressed-face) ; buttons `depress' when moused
'custom-button-pressed) ; buttons `depress' when moused
;; When possible, use relief for buttons, not bracketing. This test
;; may not be optimal.
(when custom-raised-buttons

2
lisp/cus-start.el
View file

@ -325,6 +325,8 @@ since it could result in memory overflow and make Emacs crash."
(eq system-type 'ms-dos))
((string-match "\\`w32-" (symbol-name symbol))
(eq system-type 'windows-nt))
((string-match "\\`x-.*gtk" (symbol-name symbol))
(or (boundp 'gtk) (not (eq system-type 'windows-nt))))
((string-match "\\`x-" (symbol-name symbol))
(fboundp 'x-create-frame))
(t t))))

6
lisp/cvs-status.el
View file

@ -1,6 +1,6 @@
;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs cvs status tree tools
@ -73,8 +73,8 @@
(defconst cvs-status-font-lock-keywords
`((,cvs-status-entry-leader-re
(1 'cvs-filename-face)
(2 'cvs-need-action-face))
(1 'cvs-filename)
(2 'cvs-need-action))
(,cvs-status-tags-leader-re
(,cvs-status-rev-re
(save-excursion (re-search-forward "^\n" nil 'move) (point))

74
lisp/diff-mode.el
View file

@ -175,7 +175,7 @@ when editing big diffs)."
;;;; font-lock support
;;;;
(defface diff-header-face
(defface diff-header
'((((class color) (min-colors 88) (background light))
:background "grey85")
(((class color) (min-colors 88) (background dark))
@ -187,9 +187,11 @@ when editing big diffs)."
(t :weight bold))
"`diff-mode' face inherited by hunk and index header faces."
:group 'diff-mode)
(defvar diff-header-face 'diff-header-face)
;; backward-compatibility alias
(put 'diff-header-face 'face-alias 'diff-header)
(defvar diff-header-face 'diff-header)
(defface diff-file-header-face
(defface diff-file-header
'((((class color) (min-colors 88) (background light))
:background "grey70" :weight bold)
(((class color) (min-colors 88) (background dark))
@ -201,58 +203,76 @@ when editing big diffs)."
(t :weight bold)) ; :height 1.3
"`diff-mode' face used to highlight file header lines."
:group 'diff-mode)
(defvar diff-file-header-face 'diff-file-header-face)
;; backward-compatibility alias
(put 'diff-file-header-face 'face-alias 'diff-file-header)
(defvar diff-file-header-face 'diff-file-header)
(defface diff-index-face
'((t :inherit diff-file-header-face))
(defface diff-index
'((t :inherit diff-file-header))
"`diff-mode' face used to highlight index header lines."
:group 'diff-mode)
(defvar diff-index-face 'diff-index-face)
;; backward-compatibility alias
(put 'diff-index-face 'face-alias 'diff-index)
(defvar diff-index-face 'diff-index)
(defface diff-hunk-header-face
'((t :inherit diff-header-face))
(defface diff-hunk-header
'((t :inherit diff-header))
"`diff-mode' face used to highlight hunk header lines."
:group 'diff-mode)
(defvar diff-hunk-header-face 'diff-hunk-header-face)
;; backward-compatibility alias
(put 'diff-hunk-header-face 'face-alias 'diff-hunk-header)
(defvar diff-hunk-header-face 'diff-hunk-header)
(defface diff-removed-face
'((t :inherit diff-changed-face))
(defface diff-removed
'((t :inherit diff-changed))
"`diff-mode' face used to highlight removed lines."
:group 'diff-mode)
(defvar diff-removed-face 'diff-removed-face)
;; backward-compatibility alias
(put 'diff-removed-face 'face-alias 'diff-removed)
(defvar diff-removed-face 'diff-removed)
(defface diff-added-face
'((t :inherit diff-changed-face))
(defface diff-added
'((t :inherit diff-changed))
"`diff-mode' face used to highlight added lines."
:group 'diff-mode)
(defvar diff-added-face 'diff-added-face)
;; backward-compatibility alias
(put 'diff-added-face 'face-alias 'diff-added)
(defvar diff-added-face 'diff-added)
(defface diff-changed-face
(defface diff-changed
'((((type tty pc) (class color) (background light))
:foreground "magenta" :weight bold :slant italic)
(((type tty pc) (class color) (background dark))
:foreground "yellow" :weight bold :slant italic))
"`diff-mode' face used to highlight changed lines."
:group 'diff-mode)
(defvar diff-changed-face 'diff-changed-face)
;; backward-compatibility alias
(put 'diff-changed-face 'face-alias 'diff-changed)
(defvar diff-changed-face 'diff-changed)
(defface diff-function-face
'((t :inherit diff-context-face))
(defface diff-function
'((t :inherit diff-context))
"`diff-mode' face used to highlight function names produced by \"diff -p\"."
:group 'diff-mode)
(defvar diff-function-face 'diff-function-face)
;; backward-compatibility alias
(put 'diff-function-face 'face-alias 'diff-function)
(defvar diff-function-face 'diff-function)
(defface diff-context-face
(defface diff-context
'((t :inherit shadow))
"`diff-mode' face used to highlight context and other side-information."
:group 'diff-mode)
(defvar diff-context-face 'diff-context-face)
;; backward-compatibility alias
(put 'diff-context-face 'face-alias 'diff-context)
(defvar diff-context-face 'diff-context)
(defface diff-nonexistent-face
'((t :inherit diff-file-header-face))
(defface diff-nonexistent
'((t :inherit diff-file-header))
"`diff-mode' face used to highlight nonexistent files in recursive diffs."
:group 'diff-mode)
(defvar diff-nonexistent-face 'diff-nonexistent-face)
;; backward-compatibility alias
(put 'diff-nonexistent-face 'face-alias 'diff-nonexistent)
(defvar diff-nonexistent-face 'diff-nonexistent)
(defconst diff-yank-handler '(diff-yank-function))
(defun diff-yank-function (text)
@ -915,7 +935,7 @@ See `after-change-functions' for the meaning of BEG, END and LEN."
Supports unified and context diffs as well as (to a lesser extent)
normal diffs.
When the buffer is read-only, the ESC prefix is not necessary.
IF you edit the buffer manually, diff-mode will try to update the hunk
If you edit the buffer manually, diff-mode will try to update the hunk
headers for you on-the-fly.
You can also switch between context diff and unified diff with \\[diff-context->unified],

3
lisp/ediff-mult.el
View file

@ -410,7 +410,8 @@ Commands:
\\{ediff-meta-buffer-map}"
(kill-all-local-variables)
(setq major-mode 'ediff-meta-mode)
(setq mode-name "MetaEdiff"))
(setq mode-name "MetaEdiff")
(run-mode-hooks 'ediff-meta-mode-hook))
;; the keymap for the buffer showing directory differences

2
lisp/ediff-util.el
View file

@ -117,7 +117,7 @@ Commands:
(kill-all-local-variables)
(setq major-mode 'ediff-mode)
(setq mode-name "Ediff")
(run-hooks 'ediff-mode-hook))
(run-mode-hooks 'ediff-mode-hook))

7
lisp/emacs-lisp/bindat.el
View file

@ -85,7 +85,7 @@
;; (items u8)
;; (fill 3)
;; (item repeat (items)
;; ((struct data-spec)))))
;; (struct data-spec))))
;;
;;
;; A binary data representation may look like
@ -131,7 +131,7 @@
;; | ( [FIELD] align LEN ) -- skip to next multiple of LEN bytes
;; | ( [FIELD] struct SPEC_NAME )
;; | ( [FIELD] union TAG_VAL (TAG SPEC)... [(t SPEC)] )
;; | ( [FIELD] repeat COUNT SPEC )
;; | ( [FIELD] repeat COUNT ITEM... )
;; -- In (eval EXPR), the value of the last field is available in
;; the dynamically bound variable `last'.
@ -151,7 +151,8 @@
;; -- Note: 32 bit values may be limited by emacs' INTEGER
;; implementation limits.
;;
;; -- Example: bits 2 will map bytes 0x1c 0x28 to list (2 3 7 11 13)
;; -- Example: `bits 2' will unpack 0x28 0x1c to (2 3 4 11 13)
;; and 0x1c 0x28 to (3 5 10 11 12).
;; FIELD ::= ( eval EXPR ) -- use result as NAME
;; | NAME

46
lisp/emacs-lisp/byte-run.el
View file

@ -100,23 +100,23 @@ The return value of this function is not used."
(eval-and-compile
(put ',name 'byte-optimizer 'byte-compile-inline-expand))))
(defun make-obsolete (function new &optional when)
"Make the byte-compiler warn that FUNCTION is obsolete.
The warning will say that NEW should be used instead.
If NEW is a string, that is the `use instead' message.
(defun make-obsolete (obsolete-name current-name &optional when)
"Make the byte-compiler warn that OBSOLETE-NAME is obsolete.
The warning will say that CURRENT-NAME should be used instead.
If CURRENT-NAME is a string, that is the `use instead' message.
If provided, WHEN should be a string indicating when the function
was first made obsolete, for example a date or a release number."
(interactive "aMake function obsolete: \nxObsoletion replacement: ")
(let ((handler (get function 'byte-compile)))
(let ((handler (get obsolete-name 'byte-compile)))
(if (eq 'byte-compile-obsolete handler)
(setq handler (nth 1 (get function 'byte-obsolete-info)))
(put function 'byte-compile 'byte-compile-obsolete))
(put function 'byte-obsolete-info (list new handler when)))
function)
(setq handler (nth 1 (get obsolete-name 'byte-obsolete-info)))
(put obsolete-name 'byte-compile 'byte-compile-obsolete))
(put obsolete-name 'byte-obsolete-info (list current-name handler when)))
obsolete-name)
(defmacro define-obsolete-function-alias (function new
(defmacro define-obsolete-function-alias (obsolete-name current-name
&optional when docstring)
"Set FUNCTION's function definition to NEW and mark it obsolete.
"Set OBSOLETE-NAME's function definition to CURRENT-NAME and mark it obsolete.
\(define-obsolete-function-alias 'old-fun 'new-fun \"22.1\" \"old-fun's doc.\")
@ -127,13 +127,13 @@ is equivalent to the following two lines of code:
See the docstrings of `defalias' and `make-obsolete' for more details."
`(progn
(defalias ,function ,new ,docstring)
(make-obsolete ,function ,new ,when)))
(defalias ,obsolete-name ,current-name ,docstring)
(make-obsolete ,obsolete-name ,current-name ,when)))
(defun make-obsolete-variable (variable new &optional when)
"Make the byte-compiler warn that VARIABLE is obsolete.
The warning will say that NEW should be used instead.
If NEW is a string, that is the `use instead' message.
(defun make-obsolete-variable (obsolete-name current-name &optional when)
"Make the byte-compiler warn that OBSOLETE-NAME is obsolete.
The warning will say that CURRENT-NAME should be used instead.
If CURRENT-NAME is a string, that is the `use instead' message.
If provided, WHEN should be a string indicating when the variable
was first made obsolete, for example a date or a release number."
(interactive
@ -142,12 +142,12 @@ was first made obsolete, for example a date or a release number."
(if (equal str "") (error ""))
(intern str))
(car (read-from-string (read-string "Obsoletion replacement: ")))))
(put variable 'byte-obsolete-variable (cons new when))
variable)
(put obsolete-name 'byte-obsolete-variable (cons current-name when))
obsolete-name)
(defmacro define-obsolete-variable-alias (variable new
(defmacro define-obsolete-variable-alias (obsolete-name current-name
&optional when docstring)
"Make VARIABLE a variable alias for NEW and mark it obsolete.
"Make OBSOLETE-NAME a variable alias for CURRENT-NAME and mark it obsolete.
\(define-obsolete-variable-alias 'old-var 'new-var \"22.1\" \"old-var's doc.\")
@ -159,8 +159,8 @@ is equivalent to the following two lines of code:
See the docstrings of `defvaralias' and `make-obsolete-variable' or
Info node `(elisp)Variable Aliases' for more details."
`(progn
(defvaralias ,variable ,new ,docstring)
(make-obsolete-variable ,variable ,new ,when)))
(defvaralias ,obsolete-name ,current-name ,docstring)
(make-obsolete-variable ,obsolete-name ,current-name ,when)))
(defmacro dont-compile (&rest body)
"Like `progn', but the body always runs interpreted (not compiled).

40
lisp/emacs-lisp/debug.el
View file

@ -614,7 +614,7 @@ Applies to the frame whose line point is on in the backtrace."
(terpri))
(with-current-buffer (get-buffer debugger-record-buffer)
(message "%s"
(message "%s"
(buffer-substring (line-beginning-position 0)
(line-end-position 0)))))
@ -656,22 +656,29 @@ functions to break on entry."
;;;###autoload
(defun debug-on-entry (function)
"Request FUNCTION to invoke debugger each time it is called.
If you tell the debugger to continue, FUNCTION's execution proceeds.
This works by modifying the definition of FUNCTION,
which must be written in Lisp, not predefined.
When called interactively, prompt for FUNCTION in the minibuffer.
This works by modifying the definition of FUNCTION. If you tell the
debugger to continue, FUNCTION's execution proceeds. If FUNCTION is a
normal function or a macro written in Lisp, you can also step through
its execution. FUNCTION can also be a primitive that is not a special
form, in which case stepping is not possible. Break-on-entry for
primitive functions only works when that function is called from Lisp.
Use \\[cancel-debug-on-entry] to cancel the effect of this command.
Redefining FUNCTION also cancels it."
(interactive "aDebug on entry (to function): ")
(when (and (subrp (symbol-function function))
(when (and (subrp (symbol-function function))
(eq (cdr (subr-arity (symbol-function function))) 'unevalled))
(error "Function %s is a special form" function))
(if (or (symbolp (symbol-function function))
(if (or (symbolp (symbol-function function))
(subrp (symbol-function function)))
;; The function is built-in or aliased to another function.
;; Create a wrapper in which we can add the debug call.
(fset function `(lambda (&rest debug-on-entry-args)
,(interactive-form (symbol-function function))
(apply ',(symbol-function function)
(apply ',(symbol-function function)
debug-on-entry-args)))
(when (eq (car-safe (symbol-function function)) 'autoload)
;; The function is autoloaded. Load its real definition.
@ -692,14 +699,19 @@ Redefining FUNCTION also cancels it."
;;;###autoload
(defun cancel-debug-on-entry (&optional function)
"Undo effect of \\[debug-on-entry] on FUNCTION.
If argument is nil or an empty string, cancel for all functions."
If FUNCTION is nil, cancel debug-on-entry for all functions.
When called interactively, prompt for FUNCTION in the minibuffer.
To specify a nil argument interactively, exit with an empty minibuffer."
(interactive
(list (let ((name
(completing-read "Cancel debug on entry (to function): "
(mapcar 'symbol-name debug-function-list)
nil t nil)))
(if name (intern name)))))
(if (and function (not (string= function "")))
(completing-read
"Cancel debug on entry to function (default: all functions): "
(mapcar 'symbol-name debug-function-list) nil t)))
(when name
(unless (string= name "")
(intern name))))))
(if (and function
(not (string= function ""))) ; Pre 22.1 compatibility test.
(progn
(let ((defn (debug-on-entry-1 function nil)))
(condition-case nil
@ -739,7 +751,7 @@ If argument is nil or an empty string, cancel for all functions."
(defun debug-on-entry-1 (function flag)
(let* ((defn (symbol-function function))
(tail defn))
(when (eq (car-safe tail) 'macro)
(when (eq (car-safe tail) 'macro)
(setq tail (cdr tail)))
(if (not (eq (car-safe tail) 'lambda))
;; Only signal an error when we try to set debug-on-entry.

10
lisp/emacs-lisp/derived.el
View file

@ -1,5 +1,5 @@
;;; derived.el --- allow inheritance of major modes
;;; (formerly mode-clone.el)
;; (formerly mode-clone.el)
;; Copyright (C) 1993, 1994, 1999, 2003 Free Software Foundation, Inc.
@ -221,6 +221,12 @@ See Info node `(elisp)Derived Modes' for more details."
(get (quote ,parent) 'mode-class)))
; Set up maps and tables.
(unless (keymap-parent ,map)
;; It would probably be better to set the keymap's parent
;; at the toplevel rather than inside the mode function,
;; but this is not easy for at least the following reasons:
;; - the parent (and its keymap) may not yet be loaded.
;; - the parent's keymap name may be called something else
;; than <parent>-mode-map.
(set-keymap-parent ,map (current-local-map)))
,(when declare-syntax
`(let ((parent (char-table-parent ,syntax)))
@ -440,5 +446,5 @@ Where the new table already has an entry, nothing is copied from the old one."
(provide 'derived)
;;; arch-tag: 630be248-47d1-4f02-afa0-8207de0ebea0
;; arch-tag: 630be248-47d1-4f02-afa0-8207de0ebea0
;;; derived.el ends here

43
lisp/emacs-lisp/edebug.el
View file

@ -80,7 +80,7 @@ using but only when you also use Edebug."
;;;###autoload
(defcustom edebug-all-defs nil
"*If non-nil, evaluation of any defining forms will instrument for Edebug.
"*If non-nil, evaluating defining forms instruments for Edebug.
This applies to `eval-defun', `eval-region', `eval-buffer', and
`eval-current-buffer'. `eval-region' is also called by
`eval-last-sexp', and `eval-print-last-sexp'.
@ -141,10 +141,10 @@ it."
:group 'edebug)
(defcustom edebug-initial-mode 'step
"*Initial execution mode for Edebug, if non-nil. If this variable
is non-@code{nil}, it specifies the initial execution mode for Edebug
when it is first activated. Possible values are step, next, go,
Go-nonstop, trace, Trace-fast, continue, and Continue-fast."
"*Initial execution mode for Edebug, if non-nil.
If this variable is non-nil, it specifies the initial execution mode
for Edebug when it is first activated. Possible values are step, next,
go, Go-nonstop, trace, Trace-fast, continue, and Continue-fast."
:type '(choice (const step) (const next) (const go)
(const Go-nonstop) (const trace)
(const Trace-fast) (const continue)
@ -180,15 +180,15 @@ Use this with caution since it is not debugged."
(defcustom edebug-print-length 50
"*Default value of `print-length' to use while printing results in Edebug."
"*Default value of `print-length' for printing results in Edebug."
:type 'integer
:group 'edebug)
(defcustom edebug-print-level 50
"*Default value of `print-level' to use while printing results in Edebug."
"*Default value of `print-level' for printing results in Edebug."
:type 'integer
:group 'edebug)
(defcustom edebug-print-circle t
"*Default value of `print-circle' to use while printing results in Edebug."
"*Default value of `print-circle' for printing results in Edebug."
:type 'boolean
:group 'edebug)
@ -3189,8 +3189,8 @@ The default is one second."
(defun edebug-modify-breakpoint (flag &optional condition temporary)
"Modify the breakpoint for the form at point or after it according
to FLAG: set if t, clear if nil. Then move to that point.
"Modify the breakpoint for the form at point or after it.
Set it if FLAG is non-nil, clear it otherwise. Then move to that point.
If CONDITION or TEMPORARY are non-nil, add those attributes to
the breakpoint. "
(let ((edebug-stop-point (edebug-find-stop-point)))
@ -3729,12 +3729,13 @@ Print result in minibuffer."
(eval-expression-print-format (car values))))))
(defun edebug-eval-last-sexp ()
"Evaluate sexp before point in the outside environment; value in minibuffer."
"Evaluate sexp before point in the outside environment.
Print value in minibuffer."
(interactive)
(edebug-eval-expression (edebug-last-sexp)))
(defun edebug-eval-print-last-sexp ()
"Evaluate sexp before point in the outside environment; insert the value.
"Evaluate sexp before point in outside environment; insert value.
This prints the value into current buffer."
(interactive)
(let* ((edebug-form (edebug-last-sexp))
@ -4014,20 +4015,19 @@ May only be called from within edebug-recursive-edit."
(defvar edebug-eval-mode-map nil
"Keymap for Edebug Eval mode. Superset of Lisp Interaction mode.")
(if edebug-eval-mode-map
nil
(setq edebug-eval-mode-map (copy-keymap lisp-interaction-mode-map))
(unless edebug-eval-mode-map
(setq edebug-eval-mode-map (make-sparse-keymap))
(set-keymap-parent edebug-eval-mode-map lisp-interaction-mode-map)
(define-key edebug-eval-mode-map "\C-c\C-w" 'edebug-where)
(define-key edebug-eval-mode-map "\C-c\C-d" 'edebug-delete-eval-item)
(define-key edebug-eval-mode-map "\C-c\C-u" 'edebug-update-eval-list)
(define-key edebug-eval-mode-map "\C-x\C-e" 'edebug-eval-last-sexp)
(define-key edebug-eval-mode-map "\C-j" 'edebug-eval-print-last-sexp)
)
(define-key edebug-eval-mode-map "\C-j" 'edebug-eval-print-last-sexp))
(put 'edebug-eval-mode 'mode-class 'special)
(defun edebug-eval-mode ()
(define-derived-mode edebug-eval-mode lisp-interaction-mode "Edebug Eval"
"Mode for evaluation list buffer while in Edebug.
In addition to all Interactive Emacs Lisp commands there are local and
@ -4039,12 +4039,7 @@ Eval list buffer commands:
\\{edebug-eval-mode-map}
Global commands prefixed by global-edebug-prefix:
\\{global-edebug-map}
"
(lisp-interaction-mode)
(setq major-mode 'edebug-eval-mode)
(setq mode-name "Edebug Eval")
(use-local-map edebug-eval-mode-map))
\\{global-edebug-map}")
;;; Interface with standard debugger.

36
lisp/emacs-lisp/ewoc.el
View file

@ -264,7 +264,7 @@ start position and the element DATA."
(defun ewoc--delete-node-internal (ewoc node)
"Delete a data string from EWOC.
Can not be used on the footer. Returns the wrapper that is deleted.
Can not be used on the footer. Return the wrapper that is deleted.
The start-marker in the wrapper is set to nil, so that it doesn't
consume any more resources."
(let ((dll (ewoc--dll ewoc))
@ -334,25 +334,27 @@ be inserted at the bottom of the ewoc."
(defalias 'ewoc-data 'ewoc--node-data)
(defun ewoc-enter-first (ewoc data)
"Enter DATA first in EWOC."
"Enter DATA first in EWOC.
Return the new node."
(ewoc--set-buffer-bind-dll ewoc
(ewoc-enter-after ewoc (ewoc--node-nth dll 0) data)))
(defun ewoc-enter-last (ewoc data)
"Enter DATA last in EWOC."
"Enter DATA last in EWOC.
Return the new node."
(ewoc--set-buffer-bind-dll ewoc
(ewoc-enter-before ewoc (ewoc--node-nth dll -1) data)))
(defun ewoc-enter-after (ewoc node data)
"Enter a new element DATA after NODE in EWOC.
Returns the new NODE."
Return the new node."
(ewoc--set-buffer-bind-dll ewoc
(ewoc-enter-before ewoc (ewoc--node-next dll node) data)))
(defun ewoc-enter-before (ewoc node data)
"Enter a new element DATA before NODE in EWOC.
Returns the new NODE."
Return the new node."
(ewoc--set-buffer-bind-dll ewoc
(ewoc--node-enter-before
node
@ -362,15 +364,15 @@ Returns the new NODE."
(ewoc--node-start-marker node)))))
(defun ewoc-next (ewoc node)
"Get the next node.
Returns nil if NODE is nil or the last element."
"Return the node in EWOC that follows NODE.
Return nil if NODE is nil or the last element."
(when node
(ewoc--filter-hf-nodes
ewoc (ewoc--node-next (ewoc--dll ewoc) node))))
(defun ewoc-prev (ewoc node)
"Get the previous node.
Returns nil if NODE is nil or the first element."
"Return the node in EWOC that precedes NODE.
Return nil if NODE is nil or the first element."
(when node
(ewoc--filter-hf-nodes
ewoc
@ -497,16 +499,16 @@ If the EWOC is empty, nil is returned."
best-guess)))))))
(defun ewoc-invalidate (ewoc &rest nodes)
"Refresh some elements.
The pretty-printer set for EWOC will be called for all NODES."
"Call EWOC's pretty-printer for each element in NODES.
Delete current text first, thus effecting a \"refresh\"."
(ewoc--set-buffer-bind-dll ewoc
(dolist (node nodes)
(ewoc--refresh-node (ewoc--pretty-printer ewoc) node))))
(defun ewoc-goto-prev (ewoc arg)
"Move point to the ARGth previous element.
"Move point to the ARGth previous element in EWOC.
Don't move if we are at the first element, or if EWOC is empty.
Returns the node we moved to."
Return the node we moved to."
(ewoc--set-buffer-bind-dll-let* ewoc
((node (ewoc-locate ewoc (point))))
(when node
@ -522,8 +524,8 @@ Returns the node we moved to."
(ewoc-goto-node ewoc node))))
(defun ewoc-goto-next (ewoc arg)
"Move point to the ARGth next element.
Returns the node (or nil if we just passed the last node)."
"Move point to the ARGth next element in EWOC.
Return the node (or nil if we just passed the last node)."
(ewoc--set-buffer-bind-dll-let* ewoc
((node (ewoc-locate ewoc (point))))
(while (and node (> arg 0))
@ -535,7 +537,7 @@ Returns the node (or nil if we just passed the last node)."
(ewoc-goto-node ewoc node)))
(defun ewoc-goto-node (ewoc node)
"Move point to NODE."
"Move point to NODE in EWOC."
(ewoc--set-buffer-bind-dll ewoc
(goto-char (ewoc--node-start-marker node))
(if goal-column (move-to-column goal-column))
@ -586,7 +588,7 @@ remaining arguments will be passed to PREDICATE."
(defun ewoc-buffer (ewoc)
"Return the buffer that is associated with EWOC.
Returns nil if the buffer has been deleted."
Return nil if the buffer has been deleted."
(let ((buf (ewoc--buffer ewoc)))
(when (buffer-name buf) buf)))

18
lisp/emacs-lisp/testcover.el
View file

@ -1,6 +1,6 @@
;;;; testcover.el -- Visual code-coverage tool
;; Copyright (C) 2002 Free Software Foundation, Inc.
;; Copyright (C) 2002, 2005 Free Software Foundation, Inc.
;; Author: Jonathan Yavner <jyavner@member.fsf.org>
;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
@ -150,15 +150,19 @@ call to one of the `testcover-1value-functions'."
1-valued, no error if actually multi-valued."
:group 'testcover)
(defface testcover-nohits-face
(defface testcover-nohits
'((t (:background "DeepPink2")))
"Face for forms that had no hits during coverage test"
:group 'testcover)
;; backward-compatibility alias
(put 'testcover-nohits-face 'face-alias 'testcover-nohits)
(defface testcover-1value-face
(defface testcover-1value
'((t (:background "Wheat2")))
"Face for forms that always produced the same value during coverage test"
:group 'testcover)
;; backward-compatibility alias
(put 'testcover-1value-face 'face-alias 'testcover-1value)
;;;=========================================================================
@ -477,8 +481,8 @@ same value during coverage testing."
(defun testcover-mark (def)
"Marks one DEF (a function or macro symbol) to highlight its contained forms
that did not get completely tested during coverage tests.
A marking of testcover-nohits-face (default = red) indicates that the
form was never evaluated. A marking of testcover-1value-face
A marking with the face `testcover-nohits' (default = red) indicates that the
form was never evaluated. A marking using the `testcover-1value' face
\(default = tan) indicates that the form always evaluated to the same value.
The forms throw, error, and signal are not marked. They do not return and
would always get a red mark. Some forms that always return the same
@ -506,8 +510,8 @@ eliminated by adding more test cases."
(setq ov (make-overlay (1- j) j))
(overlay-put ov 'face
(if (memq data '(unknown 1value))
'testcover-nohits-face
'testcover-1value-face))))
'testcover-nohits
'testcover-1value))))
(set-buffer-modified-p changed))))
(defun testcover-mark-all (&optional buffer)

18
lisp/emulation/cua-base.el
View file

@ -447,13 +447,13 @@ a cons (TYPE . COLOR), then both properties are affected."
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(cons :tag "Color and Type"
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(color :tag "Color")))
:group 'cua)
@ -471,13 +471,13 @@ a cons (TYPE . COLOR), then both properties are affected."
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(cons :tag "Color and Type"
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(color :tag "Color")))
:group 'cua)
@ -495,13 +495,13 @@ a cons (TYPE . COLOR), then both properties are affected."
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(cons :tag "Color and Type"
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(color :tag "Color")))
:group 'cua)
@ -520,13 +520,13 @@ a cons (TYPE . COLOR), then both properties are affected."
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(cons :tag "Color and Type"
(choice :tag "Type"
(const :tag "Filled box" box)
(const :tag "Vertical bar" bar)
(const :tag "Horisontal bar" hbar)
(const :tag "Horizontal bar" hbar)
(const :tag "Hollow box" hollow))
(color :tag "Color")))
:group 'cua)
@ -1360,7 +1360,7 @@ paste (in addition to the normal emacs bindings)."
(if (not cua-mode)
(setq emulation-mode-map-alists (delq 'cua--keymap-alist emulation-mode-map-alists))
(add-to-list 'emulation-mode-map-alists 'cua--keymap-alist)
(add-to-ordered-list 'emulation-mode-map-alists 'cua--keymap-alist 400)
(cua--select-keymaps))
(cond

6
lisp/emulation/pc-select.el
View file

@ -99,7 +99,7 @@ errors are suppressed."
(defcustom pc-select-selection-keys-only nil
"*Non-nil means only bind the basic selection keys when started.
Other keys that emulate pc-behavior will be untouched.
This gives mostly Emacs-like behaviour with only the selection keys enabled."
This gives mostly Emacs-like behavior with only the selection keys enabled."
:type 'boolean
:group 'pc-select)
@ -825,7 +825,7 @@ If the value is non-nil, call the function MODE with an argument of
;;;###autoload
(define-minor-mode pc-selection-mode
"Change mark behaviour to emulate Motif, MAC or MS-Windows cut and paste style.
"Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style.
This mode enables Delete Selection mode and Transient Mark mode.
@ -971,7 +971,7 @@ but before calling PC Selection mode):
;;;###autoload
(defcustom pc-selection-mode nil
"Toggle PC Selection mode.
Change mark behaviour to emulate Motif, MAC or MS-Windows cut and paste style,
Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style,
and cursor movement commands.
This mode enables Delete Selection mode and Transient Mark mode.
Setting this variable directly does not take effect;

2
lisp/emulation/vi.el
View file

@ -520,7 +520,7 @@ set sw=n M-x set-variable vi-shift-width n "
"Go into insert state, the text entered will be repeated if REPETITION > 1.
If PREFIX-CODE is given, do it before insertion begins if DO-IT-NOW-P is T.
In any case, the prefix-code will be done before each 'redo-insert'.
This function expects 'overwrite-mode' being set properly beforehand."
This function expects `overwrite-mode' being set properly beforehand."
(if do-it-now-p (apply (car prefix-code) (cdr prefix-code)))
(setq vi-ins-point (point))
(setq vi-ins-repetition repetition)

2
lisp/emulation/vip.el
View file

@ -1342,7 +1342,7 @@ after search."
(defun vip-find-char-forward (arg)
"Find char on the line. If called interactively read the char to find
from the terminal, and if called from vip-repeat, the char last used is
used. This behaviour is controlled by the sign of prefix numeric value."
used. This behavior is controlled by the sign of prefix numeric value."
(interactive "P")
(let ((val (vip-p-val arg)) (com (vip-getcom arg)))
(if (> val 0)

6
lisp/emulation/viper-cmd.el
View file

@ -3131,7 +3131,7 @@ On reaching beginning of line, stop and signal error."
(defun viper-find-char-forward (arg)
"Find char on the line.
If called interactively read the char to find from the terminal, and if
called from viper-repeat, the char last used is used. This behaviour is
called from viper-repeat, the char last used is used. This behavior is
controlled by the sign of prefix numeric value."
(interactive "P")
(let ((val (viper-p-val arg))
@ -3672,8 +3672,8 @@ If MAJOR-MODE is set, set the macros only in that major mode."
(sit-for 2)
(viper-unrecord-kbd-macro "///" 'vi-state)))
))
(defun viper-set-parsing-style-toggling-macro (unset)
"Set `%%%' to be a macro that toggles whether comment fields should be parsed for matching parentheses.
This is used in conjunction with the `%' command.

42
lisp/emulation/viper-init.el
View file

@ -1,6 +1,6 @@
;;; viper-init.el --- some common definitions for Viper
;; Copyright (C) 1997, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
@ -850,74 +850,84 @@ Related buffers can be cycled through via :R and :P commands."
:group 'viper)
(defface viper-search-face
(defface viper-search
'((((class color)) (:foreground "Black" :background "khaki"))
(t (:underline t :stipple "gray3")))
"*Face used to flash out the search pattern."
:group 'viper-highlighting)
;; backward-compatibility alias
(put 'viper-search-face 'face-alias 'viper-search)
;; An internal variable. Viper takes the face from here.
(defvar viper-search-face 'viper-search-face
(defvar viper-search-face 'viper-search
"Face used to flash out the search pattern.
DO NOT CHANGE this variable. Instead, use the customization widget
to customize the actual face object `viper-search-face'
this variable represents.")
(viper-hide-face 'viper-search-face)
(viper-hide-face 'viper-search)
(defface viper-replace-overlay-face
(defface viper-replace-overlay
'((((class color)) (:foreground "Black" :background "darkseagreen2"))
(t (:underline t :stipple "gray3")))
"*Face for highlighting replace regions on a window display."
:group 'viper-highlighting)
;; backward-compatibility alias
(put 'viper-replace-overlay-face 'face-alias 'viper-replace-overlay)
;; An internal variable. Viper takes the face from here.
(defvar viper-replace-overlay-face 'viper-replace-overlay-face
(defvar viper-replace-overlay-face 'viper-replace-overlay
"Face for highlighting replace regions on a window display.
DO NOT CHANGE this variable. Instead, use the customization widget
to customize the actual face object `viper-replace-overlay-face'
this variable represents.")
(viper-hide-face 'viper-replace-overlay-face)
(viper-hide-face 'viper-replace-overlay)
(defface viper-minibuffer-emacs-face
(defface viper-minibuffer-emacs
'((((class color)) (:foreground "Black" :background "darkseagreen2"))
(t (:weight bold)))
"Face used in the Minibuffer when it is in Emacs state."
:group 'viper-highlighting)
;; backward-compatibility alias
(put 'viper-minibuffer-emacs-face 'face-alias 'viper-minibuffer-emacs)
;; An internal variable. Viper takes the face from here.
(defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs-face
(defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs
"Face used in the Minibuffer when it is in Emacs state.
DO NOT CHANGE this variable. Instead, use the customization widget
to customize the actual face object `viper-minibuffer-emacs-face'
this variable represents.")
(viper-hide-face 'viper-minibuffer-emacs-face)
(viper-hide-face 'viper-minibuffer-emacs)
(defface viper-minibuffer-insert-face
(defface viper-minibuffer-insert
'((((class color)) (:foreground "Black" :background "pink"))
(t (:slant italic)))
"Face used in the Minibuffer when it is in Insert state."
:group 'viper-highlighting)
;; backward-compatibility alias
(put 'viper-minibuffer-insert-face 'face-alias 'viper-minibuffer-insert)
;; An internal variable. Viper takes the face from here.
(defvar viper-minibuffer-insert-face 'viper-minibuffer-insert-face
(defvar viper-minibuffer-insert-face 'viper-minibuffer-insert
"Face used in the Minibuffer when it is in Insert state.
DO NOT CHANGE this variable. Instead, use the customization widget
to customize the actual face object `viper-minibuffer-insert-face'
this variable represents.")
(viper-hide-face 'viper-minibuffer-insert-face)
(viper-hide-face 'viper-minibuffer-insert)
(defface viper-minibuffer-vi-face
(defface viper-minibuffer-vi
'((((class color)) (:foreground "DarkGreen" :background "grey"))
(t (:inverse-video t)))
"Face used in the Minibuffer when it is in Vi state."
:group 'viper-highlighting)
;; backward-compatibility alias
(put 'viper-minibuffer-vi-face 'face-alias 'viper-minibuffer-vi)
;; An internal variable. Viper takes the face from here.
(defvar viper-minibuffer-vi-face 'viper-minibuffer-vi-face
(defvar viper-minibuffer-vi-face 'viper-minibuffer-vi
"Face used in the Minibuffer when it is in Vi state.
DO NOT CHANGE this variable. Instead, use the customization widget
to customize the actual face object `viper-minibuffer-vi-face'
this variable represents.")
(viper-hide-face 'viper-minibuffer-vi-face)
(viper-hide-face 'viper-minibuffer-vi)
;; the current face to be used in the minibuffer
(viper-deflocalvar

2
lisp/eshell/esh-var.el
View file

@ -297,7 +297,7 @@ This function is explicit for adding to `eshell-parse-argument-hook'."
nil)
(defun eshell/export (&rest sets)
"This alias allows the 'export' command to act as bash users expect."
"This alias allows the `export' command to act as bash users expect."
(while sets
(if (and (stringp (car sets))
(string-match "^\\([^=]+\\)=\\(.*\\)" (car sets)))

17
lisp/faces.el
View file

@ -1,6 +1,6 @@
;;; faces.el --- Lisp faces
;; Copyright (C) 1992,1993,1994,1995,1996,1998,1999,2000,2001,2002,2004
;; Copyright (C) 1992,1993,1994,1995,1996,1998,1999,2000,2001,2002,2004,2005
;; Free Software Foundation, Inc.
;; Maintainer: FSF
@ -854,6 +854,8 @@ If MULTIPLE is non-nil, return a list of faces (possibly only one).
Otherwise, return a single face."
(let ((faceprop (or (get-char-property (point) 'read-face-name)
(get-char-property (point) 'face)))
(aliasfaces nil)
(nonaliasfaces nil)
faces)
;; Make a list of the named faces that the `face' property uses.
(if (and (listp faceprop)
@ -870,6 +872,13 @@ Otherwise, return a single face."
(memq (intern-soft (thing-at-point 'symbol)) (face-list)))
(setq faces (list (intern-soft (thing-at-point 'symbol)))))
;; Build up the completion tables.
(mapatoms (lambda (s)
(if (custom-facep s)
(if (get s 'face-alias)
(push (symbol-name s) aliasfaces)
(push (symbol-name s) nonaliasfaces)))))
;; If we only want one, and the default is more than one,
;; discard the unwanted ones now.
(unless multiple
@ -883,7 +892,7 @@ Otherwise, return a single face."
(if faces (mapconcat 'symbol-name faces ", ")
string-describing-default))
(format "%s: " prompt))
obarray 'custom-facep t))
(complete-in-turn nonaliasfaces aliasfaces) nil t))
;; Canonicalize the output.
(output
(if (equal input "")
@ -1864,7 +1873,7 @@ created."
;; Make `modeline' an alias for `mode-line', for compatibility.
(put 'modeline 'face-alias 'mode-line)
(put 'modeline-inactive 'face-alias 'mode-line-inactive)
(put 'modeline-higilight 'face-alias 'mode-line-highlight)
(put 'modeline-highlight 'face-alias 'mode-line-highlight)
(defface header-line
'((default
@ -2290,5 +2299,5 @@ If that can't be done, return nil."
(provide 'faces)
;;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6
;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6
;;; faces.el ends here

6
lisp/files.el
View file

@ -1766,12 +1766,12 @@ in that case, this function acts as if `enable-local-variables' were t."
("\\.ad[abs]\\'" . ada-mode)
("\\.ad[bs].dg\\'" . ada-mode)
("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
("GNUmakefile\\'" . makefile-gmake-mode)
,@(if (memq system-type '(berkeley-unix next-mach darwin))
'(("\\.mk\\'" . makefile-bsdmake-mode)
("GNUmakefile\\'" . makefile-gmake-mode)
("[Mm]akefile\\'" . makefile-bsdmake-mode))
'(("\\.mk\\'" . makefile-gmake-mode) ; Might be any make, give Gnu the host advantage
("[Mm]akefile\\'" . makefile-mode)))
("[Mm]akefile\\'" . makefile-gmake-mode)))
("Makeppfile\\'" . makefile-makepp-mode)
("\\.am\\'" . makefile-automake-mode)
;; Less common extensions come here
@ -2854,7 +2854,7 @@ the value is \"\"."
(defcustom make-backup-file-name-function nil
"A function to use instead of the default `make-backup-file-name'.
A value of nil gives the default `make-backup-file-name' behaviour.
A value of nil gives the default `make-backup-file-name' behavior.
This could be buffer-local to do something special for specific
files. If you define it, you may need to change `backup-file-name-p'

4
lisp/filesets.el
View file

@ -650,8 +650,8 @@ the filename."
Has the form ((FILE-PATTERN VIEWER PROPERTIES) ...), VIEWER being either a
function or a command name as string.
Properties is an association list determining filesets' behaviour in
several conditions. Choose one from this list:
Properties is an association list determining filesets' behavior in
several conditions. Choose one from this list:
:ignore-on-open-all ... Don't open files of this type automatically --
i.e. on open-all-files-events or when running commands

6
lisp/forms.el
View file

@ -550,7 +550,7 @@ Commands: Equivalent keys in read-only mode:
(eq (length forms-multi-line) 1))
(if (string= forms-multi-line forms-field-sep)
(error (concat "Forms control file error: "
"`forms-multi-line' is equal to 'forms-field-sep'")))
"`forms-multi-line' is equal to `forms-field-sep'")))
(error (concat "Forms control file error: "
"`forms-multi-line' must be nil or a one-character string"))))
(or (fboundp 'set-text-properties)
@ -1207,7 +1207,7 @@ Commands: Equivalent keys in read-only mode:
;; Need a file to do this.
(if (not (file-exists-p forms-file))
(error "Need existing file or explicit 'forms-number-of-records'")
(error "Need existing file or explicit `forms-number-of-fields'")
;; Visit the file and extract the first record.
(setq forms--file-buffer (find-file-noselect forms-file))
@ -1983,7 +1983,7 @@ after writing out the data."
(goto-char (aref forms--markers (1- (length forms--markers)))))))
(defun forms-print ()
"Send the records to the printer with 'print-buffer', one record per page."
"Send the records to the printer with `print-buffer', one record per page."
(interactive)
(let ((inhibit-read-only t)
(save-record forms--current-record)

4
lisp/frame.el
View file

@ -969,9 +969,9 @@ one frame, otherwise the name is displayed on the frame's caption bar."
(defun frame-current-scroll-bars (&optional frame)
"Return the current scroll-bar settings in frame FRAME.
Value is a cons (VERTICAL . HORISONTAL) where VERTICAL specifies the
Value is a cons (VERTICAL . HORIZ0NTAL) where VERTICAL specifies the
current location of the vertical scroll-bars (left, right, or nil),
and HORISONTAL specifies the current location of the horisontal scroll
and HORIZONTAL specifies the current location of the horizontal scroll
bars (top, bottom, or nil)."
(let ((vert (frame-parameter frame 'vertical-scroll-bars))
(hor nil))

16
lisp/generic-x.el
View file

@ -1733,17 +1733,17 @@ like an INI file. You can add this hook to `find-file-hook'."
(defconst show-tabs-generic-mode-font-lock-defaults-1
'(;; trailing spaces must come before...
("[ \t]+$" . 'show-tabs-space-face)
("[ \t]+$" . 'show-tabs-space)
;; ...embedded tabs
("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab-face))))
("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab))))
(defconst show-tabs-generic-mode-font-lock-defaults-2
'(;; trailing spaces must come before...
("[ \t]+$" . 'show-tabs-space-face)
("[ \t]+$" . 'show-tabs-space)
;; ...tabs
("\t+" . 'show-tabs-tab-face))))
("\t+" . 'show-tabs-tab))))
(defface show-tabs-tab-face
(defface show-tabs-tab
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
(((class color) (min-colors 88)) (:background "red1"))
@ -1751,8 +1751,10 @@ like an INI file. You can add this hook to `find-file-hook'."
(t (:weight bold)))
"Font Lock mode face used to highlight TABs."
:group 'generic-x)
;; backward-compatibility alias
(put 'show-tabs-tab-face 'face-alias 'show-tabs-tab)
(defface show-tabs-space-face
(defface show-tabs-space
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
(((class color) (min-colors 88)) (:background "yellow1"))
@ -1760,6 +1762,8 @@ like an INI file. You can add this hook to `find-file-hook'."
(t (:weight bold)))
"Font Lock mode face used to highlight spaces."
:group 'generic-x)
;; backward-compatibility alias
(put 'show-tabs-space-face 'face-alias 'show-tabs-space)
(define-generic-mode show-tabs-generic-mode
nil ;; no comment char

21
lisp/gnus/ChangeLog
View file

@ -1,3 +1,22 @@
2005-06-14 Juanma Barranquero <lekktu@gmail.com>
* gnus-sieve.el (gnus-sieve-article-add-rule):
* legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
* spam-stat.el (spam-stat-buffer-change-to-spam)
(spam-stat-buffer-change-to-non-spam): Follow error conventions.
* message.el (message-is-yours-p):
* gnus-sum.el (gnus-auto-select-subject): Fix quoting in docstring.
2005-06-14 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-view.el (mm-inline-text): Withdraw the last change.
2005-06-09 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-view.el (mm-inline-text): Turn off adaptive-fill-mode while
executing enriched-decode.
2005-06-04 Luc Teirlinck <teirllm@auburn.edu>
* gnus-art.el (article-update-date-lapsed): Use `save-match-data'.
@ -71,7 +90,7 @@
2005-05-31 Kevin Greiner <kgreiner@xpediantsolutions.com>
* gnus-group.el (): Require gnus-sum and autoload functions to
* gnus-group.el: Require gnus-sum and autoload functions to
resolve warnings when gnus-group.el compiled alone.
2005-05-30 Reiner Steib <Reiner.Steib@gmx.de>

2
lisp/gnus/gnus-sieve.el
View file

@ -129,7 +129,7 @@ Return nil if no rule could be guessed."
(let ((rule (gnus-sieve-guess-rule-for-article))
(info (gnus-get-info gnus-newsgroup-name)))
(if (null rule)
(error "Could not guess rule for article.")
(error "Could not guess rule for article")
(gnus-info-set-params info (cons rule (gnus-info-params info)))
(message "Added rule in group %s for article: %s" gnus-newsgroup-name
rule)))))

2
lisp/gnus/gnus-sum.el
View file

@ -320,7 +320,7 @@ This variable can either be the symbols `first' (place point on the
first subject), `unread' (place point on the subject line of the first
unread article), `best' (place point on the subject line of the
higest-scored article), `unseen' (place point on the subject line of
the first unseen article), 'unseen-or-unread' (place point on the subject
the first unseen article), `unseen-or-unread' (place point on the subject
line of the first unseen article or, if all article have been seen, on the
subject line of the first unread article), or a function to be called to
place point on some subject line."

8
lisp/gnus/legacy-gnus-agent.el
View file

@ -25,7 +25,7 @@ converted to the compressed format."
((file-directory-p member)
(push member search-in))
((equal (file-name-nondirectory member) ".agentview")
(setq converted-something
(setq converted-something
(or (gnus-agent-convert-agentview member)
converted-something))))))
@ -175,7 +175,7 @@ converted to the compressed format."
(t
t))))))
(kill-buffer buffer))
(error "Change gnus-agent-expire-days to an integer for gnus to start."))))
(error "Change gnus-agent-expire-days to an integer for gnus to start"))))
;; The gnus-agent-unlist-expire-days has its own conversion prompt.
;; Therefore, hide the default prompt.
@ -198,8 +198,8 @@ possible that the hook was persistently saved."
(when (cond ((eq (type-of func) 'compiled-function)
;; Search def. of compiled function for gnus-agent-do-once string
(let* (definition
print-level
(let* (definition
print-level
print-length
(standard-output
(lambda (char)

4
lisp/gnus/message.el
View file

@ -5912,9 +5912,9 @@ want to get rid of this query permanently."))
(defun message-is-yours-p ()
"Non-nil means current article is yours.
If you have added 'cancel-messages to 'message-shoot-gnksa-feet', all articles
If you have added 'cancel-messages to `message-shoot-gnksa-feet', all articles
are yours except those that have Cancel-Lock header not belonging to you.
Instead of shooting GNKSA feet, you should modify 'message-alternative-emails'
Instead of shooting GNKSA feet, you should modify `message-alternative-emails'
regexp to match all of yours addresses."
;; Canlock-logic as suggested by Per Abrahamsen
;; <abraham@dina.kvl.dk>

4
lisp/gnus/spam-stat.el
View file

@ -370,7 +370,7 @@ Use `spam-stat-ngood', `spam-stat-nbad', `spam-stat-good',
(lambda (word count)
(let ((entry (gethash word spam-stat)))
(if (not entry)
(error "This buffer has unknown words in it.")
(error "This buffer has unknown words in it")
(spam-stat-set-good entry (- (spam-stat-good entry) count))
(spam-stat-set-bad entry (+ (spam-stat-bad entry) count))
(spam-stat-set-score entry (spam-stat-compute-score entry))
@ -386,7 +386,7 @@ Use `spam-stat-ngood', `spam-stat-nbad', `spam-stat-good',
(lambda (word count)
(let ((entry (gethash word spam-stat)))
(if (not entry)
(error "This buffer has unknown words in it.")
(error "This buffer has unknown words in it")
(spam-stat-set-good entry (+ (spam-stat-good entry) count))
(spam-stat-set-bad entry (- (spam-stat-bad entry) count))
(spam-stat-set-score entry (spam-stat-compute-score entry))

2
lisp/hexl.el
View file

@ -988,7 +988,9 @@ This function is assumed to be used as call back function for `hl-line-mode'."
(define-key hexl-mode-map [up] 'hexl-previous-line)
(define-key hexl-mode-map [down] 'hexl-next-line)
(define-key hexl-mode-map [M-left] 'hexl-backward-short)
(define-key hexl-mode-map [?\e left] 'hexl-backward-short)
(define-key hexl-mode-map [M-right] 'hexl-forward-short)
(define-key hexl-mode-map [?\e right] 'hexl-forward-short)
(define-key hexl-mode-map [next] 'hexl-scroll-up)
(define-key hexl-mode-map [prior] 'hexl-scroll-down)
(define-key hexl-mode-map [home] 'hexl-beginning-of-line)

69
lisp/hilit-chg.el
View file

@ -37,9 +37,9 @@
;; it on to active mode to see them, then toggle it back off to avoid
;; distraction.
;;
;; When active, changes are displayed in `highlight-changes-face'. When
;; text is deleted, the following character is displayed in
;; `highlight-changes-delete-face' face.
;; When active, changes are displayed in the `highlight-changes' face.
;; When text is deleted, the following character is displayed in the
;; `highlight-changes-delete' face.
;;
;;
;; You can "age" different sets of changes by using
@ -48,10 +48,10 @@
;; changes. You can customize these "rotated" faces in two ways. You can
;; either explicitly define each face by customizing
;; `highlight-changes-face-list'. If, however, the faces differ from
;; `highlight-changes-face' only in the foreground color, you can simply set
;; `highlight-changes-colours'. If `highlight-changes-face-list' is nil when
;; the `highlight-changes' face only in the foreground color, you can simply set
;; `highlight-changes-colors'. If `highlight-changes-face-list' is nil when
;; the faces are required they will be constructed from
;; `highlight-changes-colours'.
;; `highlight-changes-colors'.
;;
;;
;; When a Highlight Changes mode is on (either active or passive) you can go
@ -212,42 +212,49 @@
;; However, having it set for non-delete changes can be annoying because all
;; indentation on inserts gets underlined (which can look pretty ugly!).
(defface highlight-changes-face
(defface highlight-changes
'((((min-colors 88) (class color)) (:foreground "red1" ))
(((class color)) (:foreground "red" ))
(t (:inverse-video t)))
"Face used for highlighting changes."
:group 'highlight-changes)
;; backward-compatibility alias
(put 'highlight-changes-face 'face-alias 'highlight-changes)
;; This looks pretty ugly, actually. Maybe the underline should be removed.
(defface highlight-changes-delete-face
(defface highlight-changes-delete
'((((min-colors 88) (class color)) (:foreground "red1" :underline t))
(((class color)) (:foreground "red" :underline t))
(t (:inverse-video t)))
"Face used for highlighting deletions."
:group 'highlight-changes)
;; backward-compatibility alias
(put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete)
;; A (not very good) default list of colours to rotate through.
;; A (not very good) default list of colors to rotate through.
;;
(defcustom highlight-changes-colours
(defcustom highlight-changes-colors
(if (eq (frame-parameter nil 'background-mode) 'light)
;; defaults for light background:
'( "magenta" "blue" "darkgreen" "chocolate" "sienna4" "NavyBlue")
;; defaults for dark background:
'("yellow" "magenta" "blue" "maroon" "firebrick" "green4" "DarkOrchid"))
"*Colours used by `highlight-changes-rotate-faces'.
"*Colors used by `highlight-changes-rotate-faces'.
The newest rotated change will be displayed in the first element of this list,
the next older will be in the second element etc.
This list is used if `highlight-changes-face-list' is nil, otherwise that
variable overrides this list. If you only care about foreground
colours then use this, if you want fancier faces then set
colors then use this, if you want fancier faces then set
`highlight-changes-face-list'."
:type '(repeat color)
:group 'highlight-changes)
(define-obsolete-variable-alias 'highlight-changes-colours
'highlight-changes-colors "22.1")
;; If you invoke highlight-changes-mode with no argument, should it start in
;; active or passive mode?
@ -347,15 +354,15 @@ remove it from existing buffers."
)
(while p
(setq old-name (car p))
(setq new-name (intern (format "highlight-changes-face-%d" n)))
(setq new-name (intern (format "highlight-changes-%d" n)))
(if (eq old-name new-name)
nil
;; A new face has been inserted: we don't want to modify the
;; default face so copy it. Better, though, (I think) is to
;; make a new face have the same attributes as
;; highlight-changes-face .
;; the `highlight-changes' face.
(if (eq old-name 'default)
(copy-face 'highlight-changes-face new-name)
(copy-face 'highlight-changes new-name)
(copy-face old-name new-name)
))
(setq new-list (append (list new-name) new-list))
@ -377,16 +384,16 @@ remove it from existing buffers."
(defcustom highlight-changes-face-list nil
"*A list of faces used when rotating changes.
Normally the variable is initialized to nil and the list is created from
`highlight-changes-colours' when needed. However, you can set this variable
`highlight-changes-colors' when needed. However, you can set this variable
to any list of faces. You will have to do this if you want faces which
don't just differ from `highlight-changes-face' by the foreground colour.
don't just differ from the `highlight-changes' face by the foreground color.
Otherwise, this list will be constructed when needed from
`highlight-changes-colours'."
`highlight-changes-colors'."
:type '(choice
(repeat
:notify hilit-chg-cust-fix-changes-face-list
face )
(const :tag "Derive from highlight-changes-colours" nil)
(const :tag "Derive from highlight-changes-colors" nil)
)
:group 'highlight-changes)
@ -445,7 +452,7 @@ This is the opposite of `hilit-chg-hide-changes'."
(let ((ov (make-overlay start end))
face)
(if (eq prop 'hilit-chg-delete)
(setq face 'highlight-changes-delete-face)
(setq face 'highlight-changes-delete)
(setq face (nth 1 (member prop hilit-chg-list))))
(if face
(progn
@ -727,24 +734,24 @@ Hook variables:
;; so we pick up any changes?
(if (or (null highlight-changes-face-list) ; Don't do it if it
force) ; already exists unless FORCE non-nil.
(let ((p highlight-changes-colours)
(let ((p highlight-changes-colors)
(n 1) name)
(setq highlight-changes-face-list nil)
(while p
(setq name (intern (format "highlight-changes-face-%d" n)))
(copy-face 'highlight-changes-face name)
(setq name (intern (format "highlight-changes-%d" n)))
(copy-face 'highlight-changes name)
(set-face-foreground name (car p))
(setq highlight-changes-face-list
(append highlight-changes-face-list (list name)))
(setq p (cdr p))
(setq n (1+ n)))))
(setq hilit-chg-list (list 'hilit-chg 'highlight-changes-face))
(setq hilit-chg-list (list 'hilit-chg 'highlight-changes))
(let ((p highlight-changes-face-list)
(n 1)
last-category last-face)
(while p
(setq last-category (intern (format "change-%d" n)))
;; (setq last-face (intern (format "highlight-changes-face-%d" n)))
;; (setq last-face (intern (format "highlight-changes-%d" n)))
(setq last-face (car p))
(setq hilit-chg-list
(append hilit-chg-list
@ -774,7 +781,7 @@ of `highlight-changes-face-list', one level older changes are shown in
face described by the second element, and so on. Very old changes remain
shown in the last face in the list.
You can automatically rotate colours when the buffer is saved
You can automatically rotate colors when the buffer is saved
by adding the following to `local-write-file-hooks', by evaling it in the
buffer to be saved):
@ -842,7 +849,7 @@ is non-nil."
(setq change-a (car change-info))
(setq change-b (car (cdr change-info)))
(hilit-chg-make-list)
(while change-a
(setq a-start (nth 0 (car change-a)))
@ -886,11 +893,11 @@ If a buffer is read-only, differences will be highlighted but no property
changes are made, so \\[highlight-changes-next-change] and
\\[highlight-changes-previous-change] will not work."
(interactive
(list
(list
(get-buffer (read-buffer "buffer-a " (current-buffer) t))
(get-buffer
(read-buffer "buffer-b "
(window-buffer (next-window (selected-window))) t))))
(window-buffer (next-window (selected-window))) t))))
(let ((file-a (buffer-file-name buf-a))
(file-b (buffer-file-name buf-b)))
(highlight-markup-buffers buf-a file-a buf-b file-b)
@ -917,10 +924,10 @@ changes are made, so \\[highlight-changes-next-change] and
nil ;; default
'yes ;; must exist
(let ((f (buffer-file-name (current-buffer))))
(if f
(if f
(progn
(setq f (make-backup-file-name f))
(or (file-exists-p f)
(or (file-exists-p f)
(setq f nil)))
)
f))))

63
lisp/ido.el
View file

@ -345,7 +345,7 @@
;;;###autoload
(defcustom ido-mode nil
"Determines for which functional group \(buffer and files) ido behavior
should be enabled. The following values are possible:
should be enabled. The following values are possible:
- `buffer': Turn only on ido buffer behavior \(switching, killing,
displaying...)
- `file': Turn only on ido file behavior \(finding, writing, inserting...)
@ -414,7 +414,7 @@ This allows the current directory to be opened immediate with `dired'."
"*List of file extensions specifying preferred order of file selections.
Each element is either a string with `.' as the first char, an empty
string matching files without extension, or t which is the default order
of for files with an unlisted file extension."
for files with an unlisted file extension."
:type '(repeat (choice string
(const :tag "Default order" t)))
:group 'ido)
@ -453,9 +453,9 @@ Possible values:
`otherframe' Show new file in another frame
`maybe-frame' If a file is visible in another frame, prompt to ask if you
you want to see the file in the same window of the current
frame or in the other frame.
frame or in the other frame
`always-frame' If a file is visible in another frame, raise that
frame. Otherwise, visit the file in the same window."
frame; otherwise, visit the file in the same window"
:type '(choice (const samewindow)
(const otherwindow)
(const display)
@ -466,7 +466,7 @@ Possible values:
(defcustom ido-default-buffer-method 'always-frame
"*How to switch to new buffer when using `ido-switch-buffer'.
See ido-default-file-method for details."
See `ido-default-file-method' for details."
:type '(choice (const samewindow)
(const otherwindow)
(const display)
@ -530,7 +530,7 @@ Note that the non-ido equivalent command is recorded."
(defcustom ido-max-prospects 12
"*Non-zero means that the prospect list will be limited to than number of items.
For a long list of prospects, building the full list for the minibuffer can take a
non-negletable amount of time; setting this variable reduces that time."
non-negligible amount of time; setting this variable reduces that time."
:type 'integer
:group 'ido)
@ -615,7 +615,7 @@ If zero, ftp directories are not cached."
(defcustom ido-slow-ftp-hosts nil
"*List of slow ftp hosts where ido prompting should not be used.
If an ftp host is on this list, ido automatically switches to the non-ido
equivalent function, e.g. find-file rather than ido-find-file."
equivalent function, e.g. `find-file' rather than `ido-find-file'."
:type '(repeat string)
:group 'ido)
@ -706,7 +706,7 @@ ask user whether to create buffer, or 'never to never create new buffer."
:group 'ido)
(defcustom ido-setup-hook nil
"*Hook run after the ido variables and keymap has been setup.
"*Hook run after the ido variables and keymap have been setup.
The dynamic variable `ido-cur-item' contains the current type of item that
is read by ido, possible values are file, dir, buffer, and list.
Additional keys can be defined in `ido-mode-map'."
@ -727,9 +727,9 @@ There are 10 elements in this list:
4th element is the string inserted at the end of a truncated list of prospects,
5th and 6th elements are used as brackets around the common match string which
can be completed using TAB,
7th element is the string displayed when there are a no matches, and
8th element is displayed if there is a single match (and faces are not used).
9th element is displayed when the current directory is non-readable.
7th element is the string displayed when there are no matches, and
8th element is displayed if there is a single match (and faces are not used),
9th element is displayed when the current directory is non-readable,
10th element is displayed when directory exceeds `ido-max-directory-size'."
:type '(repeat string)
:group 'ido)
@ -864,14 +864,14 @@ Must be set before enabling ido mode."
(defcustom ido-read-file-name-as-directory-commands '()
"List of commands which uses read-file-name to read a directory name.
When `ido-everywhere' is non-nil, the commands in this list will read
the directory using ido-read-directory-name."
the directory using `ido-read-directory-name'."
:type '(repeat symbol)
:group 'ido)
(defcustom ido-read-file-name-non-ido '()
"List of commands which shall not read file names the ido way.
When `ido-everywhere' is non-nil, the commands in this list will read
the file name using normal read-file-name style."
the file name using normal `read-file-name' style."
:type '(repeat symbol)
:group 'ido)
@ -895,7 +895,7 @@ See `ido-enable-last-directory-history' for details.")
(defvar ido-work-directory-list nil
"List of actual working directory names.
The current directory is inserted at the front of this list whenever a
file is opened with ido-find-file and family.")
file is opened with `ido-find-file' and family.")
(defvar ido-work-file-list nil
"List of actual work file names.
@ -909,7 +909,7 @@ Each element in the list is of the form (DIR (MTIME) FILE...).")
(defvar ido-ignore-item-temp-list nil
"List of items to ignore in current ido invocation.
Intended to be let-bound by functions which calls ido repeatedly.
Intended to be let-bound by functions which call ido repeatedly.
Should never be set permanently.")
;; Temporary storage
@ -949,7 +949,7 @@ If equal to `takeprompt', we use the prompt as the file name to be
selected.")
(defvar ido-current-directory nil
"Current directory for ido-find-file.")
"Current directory for `ido-find-file'.")
(defvar ido-auto-merge-timer nil
"Delay timer for auto merge.")
@ -1320,7 +1320,8 @@ This function also adds a hook to the minibuffer."
(add-hook 'kill-emacs-hook 'ido-kill-emacs-hook)
(unless ido-minor-mode-map-entry
(if ido-minor-mode-map-entry
(setcdr ido-minor-mode-map-entry (make-sparse-keymap))
(setq ido-minor-mode-map-entry (cons 'ido-mode (make-sparse-keymap)))
(add-to-list 'minor-mode-map-alist ido-minor-mode-map-entry))
@ -2271,7 +2272,7 @@ If no merge has yet taken place, toggle automatic merging option."
(defun ido-magic-forward-char ()
"Move forward in user input or perform magic action.
If no user input is present or at end of input, perform magic actions:
If no user input is present, or at end of input, perform magic actions:
C-x C-b ... C-f switch to ido-find-file.
C-x C-f ... C-f fallback to non-ido find-file.
C-x C-d ... C-f fallback to non-ido brief dired.
@ -2414,13 +2415,13 @@ If no buffer or file exactly matching the prompt exists, maybe create a new one.
(exit-minibuffer))
(defun ido-enter-find-file ()
"Drop into find-file from buffer switching."
"Drop into `find-file' from buffer switching."
(interactive)
(setq ido-exit 'find-file)
(exit-minibuffer))
(defun ido-enter-switch-buffer ()
"Drop into ido-switch-buffer from file switching."
"Drop into `ido-switch-buffer' from file switching."
(interactive)
(setq ido-exit 'switch-to-buffer)
(exit-minibuffer))
@ -3016,7 +3017,7 @@ for first matching file."
(defun ido-make-buffer-list (default)
;; Return the current list of buffers.
;; Currently visible buffers are put at the end of the list.
;; The hook `ido-make-buflist-hook' is run after the list has been
;; The hook `ido-make-buffer-list-hook' is run after the list has been
;; created to allow the user to further modify the order of the buffer names
;; in this list. If DEFAULT is non-nil, and corresponds to an existing buffer,
;; it is put to the start of the list.
@ -3496,7 +3497,7 @@ for first matching file."
;;; VISIT CHOSEN BUFFER
(defun ido-visit-buffer (buffer method &optional record)
"Visit file named FILE according to METHOD.
Record command in command-history if optional RECORD is non-nil."
Record command in `command-history' if optional RECORD is non-nil."
(let (win newframe)
(cond
@ -3569,9 +3570,9 @@ in another frame.
As you type in a string, all of the buffers matching the string are
displayed if substring-matching is used \(default). Look at
`ido-enable-prefix' and `ido-toggle-prefix'. When you have found the
buffer you want, it can then be selected. As you type, most keys have their
normal keybindings, except for the following: \\<ido-mode-map>
`ido-enable-prefix' and `ido-toggle-prefix'. When you have found the
buffer you want, it can then be selected. As you type, most keys have
their normal keybindings, except for the following: \\<ido-mode-map>
RET Select the buffer at the front of the list of matches. If the
list is empty, possibly prompt to create new buffer.
@ -3654,11 +3655,11 @@ The file is displayed according to `ido-default-file-method' -- the
default is to show it in the same window, unless it is already
visible in another frame.
The file name is selected interactively by typing a substring. As you type
in a string, all of the filenames matching the string are displayed if
substring-matching is used \(default). Look at `ido-enable-prefix' and
`ido-toggle-prefix'. When you have found the filename you want, it can
then be selected. As you type, most keys have their normal keybindings,
The file name is selected interactively by typing a substring. As you
type in a string, all of the filenames matching the string are displayed
if substring-matching is used \(default). Look at `ido-enable-prefix' and
`ido-toggle-prefix'. When you have found the filename you want, it can
then be selected. As you type, most keys have their normal keybindings,
except for the following: \\<ido-mode-map>
RET Select the file at the front of the list of matches. If the
@ -4171,7 +4172,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
Return the name of a buffer selected.
PROMPT is the prompt to give to the user. DEFAULT if given is the default
buffer to be selected, which will go to the front of the list.
If REQUIRE-MATCH is non-nil, an existing-buffer must be selected."
If REQUIRE-MATCH is non-nil, an existing buffer must be selected."
(let* ((ido-current-directory nil)
(ido-directory-nonreadable nil)
(ido-directory-too-big nil)

4
lisp/ielm.el
View file

@ -102,7 +102,7 @@ prevent a running IELM process from being messed up when the user
customizes `ielm-prompt'.")
(defcustom ielm-dynamic-return t
"*Controls whether \\<ielm-map>\\[ielm-return] has intelligent behaviour in IELM.
"*Controls whether \\<ielm-map>\\[ielm-return] has intelligent behavior in IELM.
If non-nil, \\[ielm-return] evaluates input for complete sexps, or inserts a newline
and indents for incomplete sexps. If nil, always inserts newlines."
:type 'boolean
@ -468,7 +468,7 @@ buffer, then the values in the working buffer are used. The variables
Expressions evaluated by IELM are not subject to `debug-on-quit' or
`debug-on-error'.
The behaviour of IELM may be customized with the following variables:
The behavior of IELM may be customized with the following variables:
* To stop beeping on error, set `ielm-noisy' to nil.
* If you don't like the prompt, you can change it by setting `ielm-prompt'.
* If you do not like that the prompt is (by default) read-only, set

38
lisp/info.el
View file

@ -3524,29 +3524,37 @@ the variable `Info-file-list-for-emacs'."
(t
(Info-goto-emacs-command-node command)))))
(defface Info-title-1-face
(defface info-title-1
'((((type tty pc) (class color)) :foreground "green" :weight bold)
(t :height 1.2 :inherit Info-title-2-face))
"Face for Info titles at level 1."
(t :height 1.2 :inherit info-title-2))
"Face for info titles at level 1."
:group 'info)
;; backward-compatibility alias
(put 'Info-title-1-face 'face-alias 'info-title-1)
(defface Info-title-2-face
(defface info-title-2
'((((type tty pc) (class color)) :foreground "lightblue" :weight bold)
(t :height 1.2 :inherit Info-title-3-face))
"Face for Info titles at level 2."
(t :height 1.2 :inherit info-title-3))
"Face for info titles at level 2."
:group 'info)
;; backward-compatibility alias
(put 'Info-title-2-face 'face-alias 'info-title-2)
(defface Info-title-3-face
(defface info-title-3
'((((type tty pc) (class color)) :weight bold)
(t :height 1.2 :inherit Info-title-4-face))
"Face for Info titles at level 3."
(t :height 1.2 :inherit info-title-4))
"Face for info titles at level 3."
:group 'info)
;; backward-compatibility alias
(put 'Info-title-3-face 'face-alias 'info-title-3)
(defface Info-title-4-face
(defface info-title-4
'((((type tty pc) (class color)) :weight bold)
(t :weight bold :inherit variable-pitch))
"Face for Info titles at level 4."
"Face for info titles at level 4."
:group 'info)
;; backward-compatibility alias
(put 'Info-title-4-face 'face-alias 'info-title-4)
(defface info-menu-header
'((((type tty pc))
@ -3686,10 +3694,10 @@ Preserve text properties."
nil t)
(let* ((c (preceding-char))
(face
(cond ((= c ?*) 'Info-title-1-face)
((= c ?=) 'Info-title-2-face)
((= c ?-) 'Info-title-3-face)
(t 'Info-title-4-face))))
(cond ((= c ?*) 'info-title-1)
((= c ?=) 'info-title-2)
((= c ?-) 'info-title-3)
(t 'info-title-4))))
(put-text-property (match-beginning 1) (match-end 1)
'font-lock-face face))
;; This is a serious problem for trying to handle multiple

4
lisp/international/mule-cmds.el
View file

@ -607,7 +607,7 @@ then call `write-region', then afterward this variable will be non-nil
only if the user was explicitly asked and specified a coding system.")
(defvar select-safe-coding-system-accept-default-p nil
"If non-nil, a function to control the behaviour of coding system selection.
"If non-nil, a function to control the behavior of coding system selection.
The meaning is the same as the argument ACCEPT-DEFAULT-P of the
function `select-safe-coding-system' (which see). This variable
overrides that argument.")
@ -1552,7 +1552,7 @@ But, if this flag is non-nil, it displays them in echo area instead."
:group 'mule)
(defvar input-method-exit-on-invalid-key nil
"This flag controls the behaviour of an input method on invalid key input.
"This flag controls the behavior of an input method on invalid key input.
Usually, when a user types a key which doesn't start any character
handled by the input method, the key is handled by turning off the
input method temporarily. After that key, the input method is re-enabled.

2
lisp/isearchb.el
View file

@ -213,7 +213,7 @@ accessed via isearchb."
((eq last-command 'isearchb-activate)
(if isearchb-last-buffer
(switch-to-buffer isearchb-last-buffer)
(error "isearchb: There is no previous buffer to toggle to."))
(error "isearchb: There is no previous buffer to toggle to"))
(isearchb-stop nil t))
(t
(message "isearchb: ")

49
lisp/iswitchb.el
View file

@ -1,6 +1,7 @@
;;; iswitchb.el --- switch between buffers using substrings
;; Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
;; Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
;; Free Software Foundation, Inc.
;; Author: Stephen Eglen <stephen@gnu.org>
;; Maintainer: Stephen Eglen <stephen@gnu.org>
@ -871,10 +872,8 @@ it is put to the start of the list."
(defun iswitchb-to-end (lst)
"Move the elements from LST to the end of `iswitchb-temp-buflist'."
(mapcar
(lambda (elem)
(setq iswitchb-temp-buflist (delq elem iswitchb-temp-buflist)))
lst)
(dolist (elem lst)
(setq iswitchb-temp-buflist (delq elem iswitchb-temp-buflist)))
(setq iswitchb-temp-buflist (nconc iswitchb-temp-buflist lst)))
(defun iswitchb-get-buffers-in-frames (&optional current)
@ -915,33 +914,19 @@ current frame, rather than all frames, regardless of value of
"Return buffers matching REGEXP.
If STRING-FORMAT is nil, consider REGEXP as just a string.
BUFFER-LIST can be list of buffers or list of strings."
(let* ((case-fold-search (iswitchb-case))
;; need reverse since we are building up list backwards
(list (reverse buffer-list))
(do-string (stringp (car list)))
name
ret)
(let* ((case-fold-search (iswitchb-case))
name ret)
(if (null string-format) (setq regexp (regexp-quote regexp)))
(setq iswitchb-invalid-regexp nil)
(catch 'invalid-regexp
(mapcar
(lambda (x)
(if do-string
(setq name x) ;We already have the name
(setq name (buffer-name x)))
(cond
((and (if (not string-format)
(string-match (regexp-quote regexp) name)
(condition-case error
(string-match regexp name)
(invalid-regexp
(setq iswitchb-invalid-regexp t)
(throw 'invalid-regexp (setq ret (cdr error))))))
(not (iswitchb-ignore-buffername-p name)))
(setq ret (cons name ret)))))
list))
ret))
(condition-case error
(dolist (x buffer-list (nreverse ret))
(setq name (if (stringp x) x (buffer-name x)))
(when (and (string-match regexp name)
(not (iswitchb-ignore-buffername-p name)))
(push name ret)))
(invalid-regexp
(setq iswitchb-invalid-regexp t)
(cdr error)))))
(defun iswitchb-ignore-buffername-p (bufname)
"Return t if the buffer BUFNAME should be ignored."
@ -1476,5 +1461,5 @@ This mode enables switching between buffers using substrings. See
(provide 'iswitchb)
;;; arch-tag: d74198ae-753f-44f2-b34f-0c515398d90a
;; arch-tag: d74198ae-753f-44f2-b34f-0c515398d90a
;;; iswitchb.el ends here

2
lisp/kmacro.el
View file

@ -631,7 +631,7 @@ A prefix argument serves as a repeat count. Zero means repeat until error.
When you call the macro, you can call the macro again by repeating
just the last key in the key sequence that you used to call this
command. See `kmacro-call-repeat-key' and `kmacro-call-repeat-with-arg'
for details on how to adjust or disable this behaviour.
for details on how to adjust or disable this behavior.
To make a macro permanent so you can call it even after defining
others, use \\[kmacro-name-last-macro]."

2
lisp/ledit.el
View file

@ -144,7 +144,7 @@ Like Lisp mode, plus these special commands:
To make Lisp mode automatically change to Ledit mode,
do (setq lisp-mode-hook 'ledit-from-lisp-mode)"
(interactive)
(lisp-mode)
(delay-mode-hooks (lisp-mode))
(ledit-from-lisp-mode))
;;;###autoload

2
lisp/loadup.el
View file

@ -313,7 +313,7 @@
(setq name (concat (downcase (substring name 0 (match-beginning 0)))
"-"
(substring name (match-end 0)))))
(if (eq system-type 'ms-dos)
(if (memq system-type '(ms-dos windows-nt cygwin))
(message "Dumping under the name emacs")
(message "Dumping under names emacs and %s" name)))
(condition-case ()

4
lisp/log-edit.el
View file

@ -154,12 +154,12 @@ different paragraphs are unrelated.
You could argue that the log entry for a file should contain the
full ChangeLog paragraph mentioning the change to the file, even though
it may mention other files, because that gives you the full context you
need to understand the change. This is the behaviour you get when this
need to understand the change. This is the behavior you get when this
variable is set to t.
On the other hand, you could argue that the log entry for a change
should contain only the text for the changes which occurred in that
file, because the log is per-file. This is the behaviour you get
file, because the log is per-file. This is the behavior you get
when this variable is set to nil.")
;;;; Internal global or buffer-local vars

12
lisp/log-view.el
View file

@ -63,21 +63,25 @@
(defvar log-view-mode-hook nil
"Hook run at the end of `log-view-mode'.")
(defface log-view-file-face
(defface log-view-file
'((((class color) (background light))
(:background "grey70" :weight bold))
(t (:weight bold)))
"Face for the file header line in `log-view-mode'."
:group 'log-view)
(defvar log-view-file-face 'log-view-file-face)
;; backward-compatibility alias
(put 'log-view-file-face 'face-alias 'log-view-file)
(defvar log-view-file-face 'log-view-file)
(defface log-view-message-face
(defface log-view-message
'((((class color) (background light))
(:background "grey85"))
(t (:weight bold)))
"Face for the message header line in `log-view-mode'."
:group 'log-view)
(defvar log-view-message-face 'log-view-message-face)
;; backward-compatibility alias
(put 'log-view-message-face 'face-alias 'log-view-message)
(defvar log-view-message-face 'log-view-message)
(defconst log-view-file-re
(concat "^\\("

5
lisp/longlines.el
View file

@ -153,11 +153,6 @@ major mode changes."
;; Showing the effect of hard newlines in the buffer
(defface longlines-visible-face
'((t (:background "red")))
"Face used to make hard newlines visible in `longlines-mode'."
:group 'longlines)
(defun longlines-show-hard-newlines (&optional arg)
"Make hard newlines visible by adding a face.
With optional argument ARG, make the hard newlines invisible again."

2
lisp/mail/mspools.el
View file

@ -357,7 +357,7 @@ nil."
(use-local-map mspools-mode-map)
(setq major-mode 'mspools-mode)
(setq mode-name "MSpools")
)
(run-mode-hooks 'mspools-mode-hook))
(defun mspools-get-spool-files ()
"Find the list of spool files and display them in *spools* buffer."

2
lisp/mail/rmailedit.el
View file

@ -57,7 +57,7 @@ to return to regular RMAIL:
* \\[rmail-cease-edit] makes them permanent.
This functions runs the normal hook `rmail-edit-mode-hook'.
\\{rmail-edit-map}"
(text-mode)
(delay-mode-hooks (text-mode))
(use-local-map rmail-edit-map)
(setq major-mode 'rmail-edit-mode)
(setq mode-name "RMAIL Edit")

2
lisp/mail/undigest.el
View file

@ -40,7 +40,7 @@
"^----.*\\([Ff]orwarded\\|[Oo]riginal\\).*[Mm]essage"
"*Regexp to match the string that introduces forwarded messages.
This is not a header, but a string contained in the body of the message.
You may need to customise it for local needs."
You may need to customize it for local needs."
:type 'regexp
:group 'rmail-headers)

20
lisp/makefile.w32-in
View file

@ -289,13 +289,13 @@ recompile: doit
# Prepare a bootstrap in the lisp subdirectory.
#
# Build loaddefs.el, because it's not sure it's up-to-date, and if it's not,
# that might lead to errors during the bootstrap because something fails to
# autoload as expected. However, if there is no emacs binary, then we can't
# build autoloads yet, so just make sure there's some loaddefs.el file, as
# it's necessary for generating the binary (because loaddefs.el is an
# automatically generated file, we don't want to store it in the source
# repository).
# Build loaddefs.el to make sure it's up-to-date. If it's not, that
# might lead to errors during the bootstrap because something fails to
# autoload as expected. If there is no emacs binary, then we can't
# build autoloads yet. In that case we have to use ldefs-boot.el;
# bootstrap should always work with ldefs-boot.el. (Because
# loaddefs.el is an automatically generated file, we don't want to
# store it in the source repository).
#
# Remove compiled Lisp files so that bootstrap-emacs will be built from
# sources only.
@ -305,15 +305,13 @@ bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
bootstrap-clean-CMD:
# if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
if not exist $(lisp)\loaddefs.el cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
-for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g
bootstrap-clean-SH:
# if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi
# -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
if ! test -r $(lisp)/loaddefs.el; then \
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \
fi
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
-for dir in . $(WINS); do rm -f $$dir/*.elc; done
# Generate/update files for the bootstrap process.

12
lisp/man.el
View file

@ -391,10 +391,11 @@ Otherwise, the value is whatever the function
table)
"Syntax table used in Man mode buffers.")
(if Man-mode-map
nil
(setq Man-mode-map (copy-keymap button-buffer-map))
(unless Man-mode-map
(setq Man-mode-map (make-sparse-keymap))
(suppress-keymap Man-mode-map)
(set-keymap-parent Man-mode-map button-buffer-map)
(define-key Man-mode-map " " 'scroll-up)
(define-key Man-mode-map "\177" 'scroll-down)
(define-key Man-mode-map "n" 'Man-next-section)
@ -410,8 +411,7 @@ Otherwise, the value is whatever the function
(define-key Man-mode-map "k" 'Man-kill)
(define-key Man-mode-map "q" 'Man-quit)
(define-key Man-mode-map "m" 'man)
(define-key Man-mode-map "?" 'describe-mode)
)
(define-key Man-mode-map "?" 'describe-mode))
;; buttons
(define-button-type 'Man-xref-man-page
@ -1023,6 +1023,8 @@ manpage command."
;; ======================================================================
;; set up manual mode in buffer and build alists
(put 'Man-mode 'mode-class 'special)
(defun Man-mode ()
"A mode for browsing Un*x manual pages.

2
lisp/menu-bar.el
View file

@ -606,7 +606,7 @@ PROPS are additional properties."
`(progn
(defun ,name (&optional interactively)
,(concat "Toggle whether to " (downcase (substring help 0 1))
(substring help 1) ".\
(substring help 1) ".
In an interactive call, record this option as a candidate for saving
by \"Save Options\" in Custom buffers.")
(interactive "p")

4
lisp/mh-e/ChangeLog
View file

@ -1,3 +1,7 @@
2005-06-14 Juanma Barranquero <lekktu@gmail.com>
* mh-mime.el (mh-secure-message): Follow error conventions.
2005-05-28 Bill Wohler <wohler@newt.com>
Released MH-E version 7.84.

2
lisp/mh-e/mh-mime.el
View file

@ -597,7 +597,7 @@ IDENTITY is optionally the default-user-id to use."
(let ((valid-methods (list "pgpmime" "pgp" "smime"))
(valid-modes (list "sign" "encrypt" "signencrypt" "none")))
(if (not (member method valid-methods))
(error (format "Sorry. METHOD \"%s\" is invalid." method)))
(error (format "Sorry. METHOD \"%s\" is invalid" method)))
(if (not (member mode valid-modes))
(error (format "Sorry. MODE \"%s\" is invalid" mode)))
(mml-unsecure-message)

2
lisp/mouse.el
View file

@ -64,7 +64,7 @@ or perform the normal Mouse-1 action (typically set point).
The absolute numeric value specifices the maximum duration of a
\"short click\" in milliseconds. A positive value means that a
short click follows the link, and a longer click performs the
normal action. A negative value gives the opposite behaviour.
normal action. A negative value gives the opposite behavior.
If value is `double', a double click follows the link.

53
lisp/net/ange-ftp.el
View file

@ -1964,35 +1964,34 @@ on the gateway machine to do the ftp instead."
\\{comint-mode-map}"
(interactive)
(comint-mode)
(delay-mode-hooks (comint-mode))
(setq major-mode 'internal-ange-ftp-mode)
(setq mode-name "Internal Ange-ftp")
(let ((proc (get-buffer-process (current-buffer))))
(make-local-variable 'ange-ftp-process-string)
(setq ange-ftp-process-string "")
(make-local-variable 'ange-ftp-process-busy)
(make-local-variable 'ange-ftp-process-result)
(make-local-variable 'ange-ftp-process-msg)
(make-local-variable 'ange-ftp-process-multi-skip)
(make-local-variable 'ange-ftp-process-result-line)
(make-local-variable 'ange-ftp-process-continue)
(make-local-variable 'ange-ftp-hash-mark-count)
(make-local-variable 'ange-ftp-binary-hash-mark-size)
(make-local-variable 'ange-ftp-ascii-hash-mark-size)
(make-local-variable 'ange-ftp-hash-mark-unit)
(make-local-variable 'ange-ftp-xfer-size)
(make-local-variable 'ange-ftp-last-percent)
(setq ange-ftp-hash-mark-count 0)
(setq ange-ftp-xfer-size 0)
(setq ange-ftp-process-result-line "")
(setq comint-prompt-regexp "^ftp> ")
(make-local-variable 'comint-password-prompt-regexp)
;; This is a regexp that can't match anything.
;; ange-ftp has its own ways of handling passwords.
(setq comint-password-prompt-regexp "^a\\'z")
(make-local-variable 'paragraph-start)
(setq paragraph-start comint-prompt-regexp)))
(make-local-variable 'ange-ftp-process-string)
(setq ange-ftp-process-string "")
(make-local-variable 'ange-ftp-process-busy)
(make-local-variable 'ange-ftp-process-result)
(make-local-variable 'ange-ftp-process-msg)
(make-local-variable 'ange-ftp-process-multi-skip)
(make-local-variable 'ange-ftp-process-result-line)
(make-local-variable 'ange-ftp-process-continue)
(make-local-variable 'ange-ftp-hash-mark-count)
(make-local-variable 'ange-ftp-binary-hash-mark-size)
(make-local-variable 'ange-ftp-ascii-hash-mark-size)
(make-local-variable 'ange-ftp-hash-mark-unit)
(make-local-variable 'ange-ftp-xfer-size)
(make-local-variable 'ange-ftp-last-percent)
(setq ange-ftp-hash-mark-count 0)
(setq ange-ftp-xfer-size 0)
(setq ange-ftp-process-result-line "")
(setq comint-prompt-regexp "^ftp> ")
(make-local-variable 'comint-password-prompt-regexp)
;; This is a regexp that can't match anything.
;; ange-ftp has its own ways of handling passwords.
(setq comint-password-prompt-regexp "^a\\'z")
(make-local-variable 'paragraph-start)
(setq paragraph-start comint-prompt-regexp)
(run-mode-hooks 'internal-ange-ftp-mode-hook))
(defcustom ange-ftp-raw-login nil
"*Use raw ftp commands for login, if account password is not nil.

2
lisp/net/browse-url.el
View file

@ -487,7 +487,7 @@ enabled. The port number should be set in `browse-url-CCI-port'."
(defcustom browse-url-xterm-program "xterm"
"*The name of the terminal emulator used by `browse-url-lynx-xterm'.
This might, for instance, be a separate colour version of xterm."
This might, for instance, be a separate color version of xterm."
:type 'string
:group 'browse-url)

3
lisp/net/eudc-hotlist.el
View file

@ -56,7 +56,8 @@ These are the special commands of this mode:
(featurep 'menubar))
(set-buffer-menubar current-menubar)
(add-submenu nil (cons "EUDC-Hotlist" (cdr (cdr eudc-hotlist-menu)))))
(setq buffer-read-only t))
(setq buffer-read-only t)
(run-mode-hooks 'eudc-hotlist-mode-hook))
;;;###autoload
(defun eudc-edit-hotlist ()

4
lisp/net/tramp.el
View file

@ -5095,7 +5095,7 @@ file exists and nonzero exit status otherwise."
(and (setq tramp-file-exists-command "ls -d %s")
(file-exists-p existing)
(not (file-exists-p nonexisting))))
(error "Couldn't find command to check if file exists."))))
(error "Couldn't find command to check if file exists"))))
;; CCC test ksh or bash found for tilde expansion?
@ -5131,7 +5131,7 @@ file exists and nonzero exit status otherwise."
60 (format "\\(\\(%s\\)\\|\\(%s\\)\\)\\'"
tramp-shell-prompt-pattern shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't find remote `%s' prompt." shell))
(error "Couldn't find remote `%s' prompt" shell))
(tramp-message
9 "Setting remote shell prompt...")
;; Douglas Gray Stephens <DGrayStephens@slb.com> says that we

2
lisp/obsolete/lazy-lock.el
View file

@ -506,7 +506,7 @@ When Lazy Lock mode is enabled, fontification can be lazy in a number of ways:
been idle for `lazy-lock-stealth-time' seconds, while Emacs remains idle.
This is useful if any buffer has any deferred fontification.
Basic Font Lock mode on-the-fly fontification behaviour fontifies modified
Basic Font Lock mode on-the-fly fontification behavior fontifies modified
lines only. Thus, if `lazy-lock-defer-contextually' is non-nil, Lazy Lock mode
on-the-fly fontification may fontify differently, albeit correctly. In any
event, to refontify some lines you can use \\[font-lock-fontify-block].

12
lisp/paren.el
View file

@ -71,7 +71,7 @@ otherwise)."
:group 'paren-showing
:version "20.3")
(defface show-paren-match-face
(defface show-paren-match
'((((class color) (background light))
:background "turquoise") ; looks OK on tty (becomes cyan)
(((class color) (background dark))
@ -83,13 +83,17 @@ otherwise)."
"Show Paren mode face used for a matching paren."
:group 'faces
:group 'paren-showing)
;; backward-compatibility alias
(put 'show-paren-match-face 'face-alias 'show-paren-match)
(defface show-paren-mismatch-face
(defface show-paren-mismatch
'((((class color)) (:foreground "white" :background "purple"))
(t (:inverse-video t)))
"Show Paren mode face used for a mismatching paren."
:group 'faces
:group 'paren-showing)
;; backward-compatibility alias
(put 'show-paren-mismatch-face 'face-alias 'show-paren-mismatch)
(defvar show-paren-highlight-openparen t
"*Non-nil turns on openparen highlighting when matching forward.")
@ -193,8 +197,8 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
(progn
(if show-paren-ring-bell-on-mismatch
(beep))
(setq face 'show-paren-mismatch-face))
(setq face 'show-paren-match-face))
(setq face 'show-paren-mismatch))
(setq face 'show-paren-match))
;;
;; If matching backwards, highlight the closeparen
;; before point as well as its matching open.

4
lisp/pcvs-defs.el
View file

@ -1,7 +1,7 @@
;;; pcvs-defs.el --- variable definitions for PCL-CVS
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
;; 2000, 2003, 2004 Free Software Foundation, Inc.
;; 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
@ -381,7 +381,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
;; mouse bindings
([mouse-2] . cvs-mode-find-file)
([follow-link] . (lambda (pos)
(if (eq (get-char-property pos 'face) 'cvs-filename-face) t)))
(if (eq (get-char-property pos 'face) 'cvs-filename) t)))
([(down-mouse-3)] . cvs-menu)
;; dired-like bindings
("\C-o" . cvs-mode-display-file)

44
lisp/pcvs-info.el
View file

@ -61,7 +61,7 @@ to confuse some users sometimes."
;;;; Faces for fontification
;;;;
(defface cvs-header-face
(defface cvs-header
'((((class color) (background dark))
(:foreground "lightyellow" :weight bold))
(((class color) (background light))
@ -69,8 +69,10 @@ to confuse some users sometimes."
(t (:weight bold)))
"PCL-CVS face used to highlight directory changes."
:group 'pcl-cvs)
;; backward-compatibility alias
(put 'cvs-header-face 'face-alias 'cvs-header)
(defface cvs-filename-face
(defface cvs-filename
'((((class color) (background dark))
(:foreground "lightblue"))
(((class color) (background light))
@ -78,8 +80,10 @@ to confuse some users sometimes."
(t ()))
"PCL-CVS face used to highlight file names."
:group 'pcl-cvs)
;; backward-compatibility alias
(put 'cvs-filename-face 'face-alias 'cvs-filename)
(defface cvs-unknown-face
(defface cvs-unknown
'((((class color) (background dark))
(:foreground "red"))
(((class color) (background light))
@ -87,8 +91,10 @@ to confuse some users sometimes."
(t (:slant italic)))
"PCL-CVS face used to highlight unknown file status."
:group 'pcl-cvs)
;; backward-compatibility alias
(put 'cvs-unknown-face 'face-alias 'cvs-unknown)
(defface cvs-handled-face
(defface cvs-handled
'((((class color) (background dark))
(:foreground "pink"))
(((class color) (background light))
@ -96,8 +102,10 @@ to confuse some users sometimes."
(t ()))
"PCL-CVS face used to highlight handled file status."
:group 'pcl-cvs)
;; backward-compatibility alias
(put 'cvs-handled-face 'face-alias 'cvs-handled)
(defface cvs-need-action-face
(defface cvs-need-action
'((((class color) (background dark))
(:foreground "orange"))
(((class color) (background light))
@ -105,8 +113,10 @@ to confuse some users sometimes."
(t (:slant italic)))
"PCL-CVS face used to highlight status of files needing action."
:group 'pcl-cvs)
;; backward-compatibility alias
(put 'cvs-need-action-face 'face-alias 'cvs-need-action)
(defface cvs-marked-face
(defface cvs-marked
'((((min-colors 88) (class color) (background dark))
(:foreground "green1" :weight bold))
(((class color) (background dark))
@ -116,14 +126,18 @@ to confuse some users sometimes."
(t (:weight bold)))
"PCL-CVS face used to highlight marked file indicator."
:group 'pcl-cvs)
;; backward-compatibility alias
(put 'cvs-marked-face 'face-alias 'cvs-marked)
(defface cvs-msg-face
(defface cvs-msg
'((t (:slant italic)))
"PCL-CVS face used to highlight CVS messages."
:group 'pcl-cvs)
;; backward-compatibility alias
(put 'cvs-msg-face 'face-alias 'cvs-msg)
(defvar cvs-fi-up-to-date-face 'cvs-handled-face)
(defvar cvs-fi-unknown-face 'cvs-unknown-face)
(defvar cvs-fi-up-to-date-face 'cvs-handled)
(defvar cvs-fi-unknown-face 'cvs-unknown)
(defvar cvs-fi-conflict-face 'font-lock-warning-face)
;; There is normally no need to alter the following variable, but if
@ -332,19 +346,17 @@ For use by the cookie package."
(case type
(DIRCHANGE (concat "In directory "
(cvs-add-face (cvs-fileinfo->full-name fileinfo)
'cvs-header-face t
'cvs-goal-column t)
'cvs-header t 'cvs-goal-column t)
":"))
(MESSAGE
(cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))
'cvs-msg-face))
'cvs-msg))
(t
(let* ((status (if (cvs-fileinfo->marked fileinfo)
(cvs-add-face "*" 'cvs-marked-face)
(cvs-add-face "*" 'cvs-marked)
" "))
(file (cvs-add-face (cvs-fileinfo->pp-name fileinfo)
'cvs-filename-face t
'cvs-goal-column t))
'cvs-filename t 'cvs-goal-column t))
(base (or (cvs-fileinfo->base-rev fileinfo) ""))
(head (cvs-fileinfo->head-rev fileinfo))
(type
@ -357,7 +369,7 @@ For use by the cookie package."
(downcase (symbol-name type))
"-face"))))
(or (and (boundp sym) (symbol-value sym))
'cvs-need-action-face))))
'cvs-need-action))))
(cvs-add-face str face cvs-status-map)))
(side (or
;; maybe a subtype

8
lisp/pcvs.el
View file

@ -944,9 +944,9 @@ With a prefix argument, prompt for cvs FLAGS to use."
(defun-cvs-mode (cvs-mode-checkout . NOARGS) (dir)
"Run cvs checkout against the current branch.
The files are stored to DIR."
(interactive
(interactive
(let* ((branch (cvs-prefix-get 'cvs-branch-prefix))
(prompt (format "CVS Checkout Directory for `%s%s': "
(prompt (format "CVS Checkout Directory for `%s%s': "
(cvs-get-module)
(if branch (format " (branch: %s)" branch)
""))))
@ -1123,7 +1123,7 @@ Full documentation is in the Texinfo file."
("->" cvs-secondary-branch-prefix))))
" " cvs-mode-line-process))
(if buffer-file-name
(error "Use M-x cvs-quickdir to get a *cvs* buffer."))
(error "Use M-x cvs-quickdir to get a *cvs* buffer"))
(buffer-disable-undo)
;;(set (make-local-variable 'goal-column) cvs-cursor-column)
(set (make-local-variable 'revert-buffer-function) 'cvs-mode-revert-buffer)
@ -1980,7 +1980,7 @@ With a prefix, opens the buffer in an OTHER window."
(when (and (/= (point) (progn (posn-set-point (event-end e)) (point)))
(not (memq (get-text-property (1- (line-end-position))
'font-lock-face)
'(cvs-header-face cvs-filename-face))))
'(cvs-header cvs-filename))))
(error "Not a file name"))
(cvs-mode!
(lambda (&optional rev)

6
lisp/play/blackbox.el
View file

@ -117,14 +117,14 @@ The usual mnemonic keys move the cursor around the box.
\\<blackbox-mode-map>\\[bb-bol] and \\[bb-eol] move to the beginning and end of line, respectively.
\\[bb-romp] -- send in a ray from point, or toggle a ball at point
\\[bb-done] -- end game and get score
"
\\[bb-done] -- end game and get score"
(interactive)
(kill-all-local-variables)
(use-local-map blackbox-mode-map)
(setq truncate-lines t)
(setq major-mode 'blackbox-mode)
(setq mode-name "Blackbox"))
(setq mode-name "Blackbox")
(run-mode-hooks 'blackbox-mode-hook))
;;;###autoload
(defun blackbox (num)

17
lisp/play/doctor.el
View file

@ -59,30 +59,21 @@
(set what ww)
first))
(defvar doctor-mode-map nil)
(if doctor-mode-map
nil
(setq doctor-mode-map (make-sparse-keymap))
(define-key doctor-mode-map "\n" 'doctor-read-print)
(define-key doctor-mode-map "\r" 'doctor-ret-or-read))
(defun doctor-mode ()
(define-derived-mode doctor-mode text-mode "Doctor"
"Major mode for running the Doctor (Eliza) program.
Like Text mode with Auto Fill mode
except that RET when point is after a newline, or LFD at any time,
reads the sentence before point, and prints the Doctor's answer."
(interactive)
(text-mode)
(make-doctor-variables)
(use-local-map doctor-mode-map)
(setq major-mode 'doctor-mode)
(setq mode-name "Doctor")
(turn-on-auto-fill)
(doctor-type '(i am the psychotherapist \.
(doc$ please) (doc$ describe) your (doc$ problems) \.
each time you are finished talking, type \R\E\T twice \.))
(insert "\n"))
(define-key doctor-mode-map "\n" 'doctor-read-print)
(define-key doctor-mode-map "\r" 'doctor-ret-or-read)
(defun make-doctor-variables ()
(make-local-variable 'typos)
(setq typos

22
lisp/play/dunnet.el
View file

@ -53,15 +53,10 @@
;;;; Mode definitions for interactive mode
(defun dun-mode ()
(define-derived-mode dun-mode text-mode "Dungeon"
"Major mode for running dunnet."
(interactive)
(text-mode)
(make-local-variable 'scroll-step)
(setq scroll-step 2)
(use-local-map dungeon-mode-map)
(setq major-mode 'dun-mode)
(setq mode-name "Dungeon"))
(setq scroll-step 2))
(defun dun-parse (arg)
"Function called when return is pressed in interactive mode to parse line."
@ -1366,9 +1361,8 @@ for a moment, then straighten yourself up.
(setq dun-current-room 1)
(setq dun-exitf nil)
(setq dun-badcd nil)
(defvar dungeon-mode-map nil)
(setq dungeon-mode-map (make-sparse-keymap))
(define-key dungeon-mode-map "\r" 'dun-parse)
(define-obsolete-variable-alias 'dungeon-mode-map 'dun-mode-map "22.1")
(define-key dun-mode-map "\r" 'dun-parse)
(defvar dungeon-batch-map (make-keymap))
(if (string= (substring emacs-version 0 2) "18")
(let (n)
@ -2594,7 +2588,7 @@ treasures for points?" "4" "four")
(if dun-logged-in
(progn
(setq dungeon-mode 'unix)
(define-key dungeon-mode-map "\r" 'dun-unix-parse)
(define-key dun-mode-map "\r" 'dun-unix-parse)
(dun-mprinc "$ "))))
(defun dun-login ()
@ -2860,7 +2854,7 @@ drwxr-xr-x 3 root staff 2048 Jan 1 1970 ..")
(defun dun-uexit (args)
(setq dungeon-mode 'dungeon)
(dun-mprincl "\nYou step back from the console.")
(define-key dungeon-mode-map "\r" 'dun-parse)
(define-key dun-mode-map "\r" 'dun-parse)
(if (not dun-batch-mode)
(dun-messages)))
@ -3059,7 +3053,7 @@ drwxr-xr-x 3 root staff 2048 Jan 1 1970 ..")
(defun dun-dos-interface ()
(dun-dos-boot-msg)
(setq dungeon-mode 'dos)
(define-key dungeon-mode-map "\r" 'dun-dos-parse)
(define-key dun-mode-map "\r" 'dun-dos-parse)
(dun-dos-prompt))
(defun dun-dos-type (args)
@ -3117,7 +3111,7 @@ File not found")))
(defun dun-dos-exit (args)
(setq dungeon-mode 'dungeon)
(dun-mprincl "\nYou power down the machine and step back.")
(define-key dungeon-mode-map "\r" 'dun-parse)
(define-key dun-mode-map "\r" 'dun-parse)
(if (not dun-batch-mode)
(dun-messages)))

18
lisp/play/gomoku.el
View file

@ -1,6 +1,6 @@
;;; gomoku.el --- Gomoku game between you and Emacs
;; Copyright (C) 1988, 1994, 1996, 2001, 2003 Free Software Foundation, Inc.
;; Copyright (C) 1988, 1994, 1996, 2001, 2003, 2005 Free Software Foundation, Inc.
;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
;; Maintainer: FSF
@ -160,22 +160,24 @@ One useful value to include is `turn-on-font-lock' to highlight the pieces."
(defvar gomoku-emacs-won ()
"For making font-lock use the winner's face for the line.")
(defface gomoku-font-lock-O-face
(defface gomoku-O
'((((class color)) (:foreground "red" :weight bold)))
"Face to use for Emacs' O."
:group 'gomoku)
;; backward-compatibility alias
(put 'gomoku-font-lock-O-face 'face-alias 'gomoku-O)
(defface gomoku-font-lock-X-face
(defface gomoku-X
'((((class color)) (:foreground "green" :weight bold)))
"Face to use for your X."
:group 'gomoku)
;; backward-compatibility alias
(put 'gomoku-font-lock-X-face 'face-alias 'gomoku-X)
(defvar gomoku-font-lock-keywords
'(("O" . 'gomoku-font-lock-O-face)
("X" . 'gomoku-font-lock-X-face)
("[-|/\\]" 0 (if gomoku-emacs-won
'gomoku-font-lock-O-face
'gomoku-font-lock-X-face)))
'(("O" . 'gomoku-O)
("X" . 'gomoku-X)
("[-|/\\]" 0 (if gomoku-emacs-won 'gomoku-O 'gomoku-X)))
"*Font lock rules for Gomoku.")
(put 'gomoku-mode 'front-sticky

24
lisp/play/mpuz.el
View file

@ -57,28 +57,36 @@ t means never ding, and `error' means only ding on wrong input."
:type 'boolean
:group 'mpuz)
(defface mpuz-unsolved-face
(defface mpuz-unsolved
'((((class color)) (:foreground "red1" :bold t))
(t (:bold t)))
"*Face to use for letters to be solved."
:group 'mpuz)
;; backward-compatibility alias
(put 'mpuz-unsolved-face 'face-alias 'mpuz-unsolved)
(defface mpuz-solved-face
(defface mpuz-solved
'((((class color)) (:foreground "green1" :bold t))
(t (:bold t)))
"*Face to use for solved digits."
:group 'mpuz)
;; backward-compatibility alias
(put 'mpuz-solved-face 'face-alias 'mpuz-solved)
(defface mpuz-trivial-face
(defface mpuz-trivial
'((((class color)) (:foreground "blue" :bold t))
(t (:bold t)))
"*Face to use for trivial digits solved for you."
:group 'mpuz)
;; backward-compatibility alias
(put 'mpuz-trivial-face 'face-alias 'mpuz-trivial)
(defface mpuz-text-face
(defface mpuz-text
'((t (:inherit variable-pitch)))
"*Face to use for text on right."
:group 'mpuz)
;; backward-compatibility alias
(put 'mpuz-text-face 'face-alias 'mpuz-text)
;; Mpuz mode and keymaps
@ -296,7 +304,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
(defun mpuz-create-buffer ()
"Create (or recreate) the puzzle buffer. Return it."
(let ((buf (get-buffer-create "*Mult Puzzle*"))
(face '(face mpuz-text-face))
(face '(face mpuz-text))
buffer-read-only)
(save-excursion
(set-buffer buf)
@ -347,9 +355,9 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
(+ digit ?0)
(+ (mpuz-to-letter digit) ?A)))
(face `(face
,(cond ((aref mpuz-trivial-digits digit) 'mpuz-trivial-face)
((aref mpuz-found-digits digit) 'mpuz-solved-face)
('mpuz-unsolved-face))))
,(cond ((aref mpuz-trivial-digits digit) 'mpuz-trivial)
((aref mpuz-found-digits digit) 'mpuz-solved)
('mpuz-unsolved))))
buffer-read-only)
(mapc (lambda (square)
(goto-line (car square)) ; line before column!

364
lisp/printing.el
View file

@ -1,17 +1,17 @@
;;; printing.el --- printing utilities
;; Copyright (C) 2000, 2001, 2002, 2003, 2004
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Time-stamp: <2004/11/21 20:56:53 vinicius>
;; Time-stamp: <2005/06/11 19:51:32 vinicius>
;; Keywords: wp, print, PostScript
;; Version: 6.8.3
;; Version: 6.8.4
;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
(defconst pr-version "6.8.3"
"printing.el, v 6.8.3 <2004/11/17 vinicius>
(defconst pr-version "6.8.4"
"printing.el, v 6.8.4 <2005/06/11 vinicius>
Please send all bug fixes and enhancements to
Vinicius Jose Latorre <viniciusjl@ig.com.br>
@ -143,7 +143,7 @@ Please send all bug fixes and enhancements to
;; 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
;; ~/.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):
;;
@ -259,9 +259,9 @@ Please send all bug fixes and enhancements to
;; PostScript printer. So, please, don't include this printer in
;; `pr-txt-printer-alist' (which see).
;;
;; 5. Use gsprint instead of ghostscript to print monochrome PostScript files
;; in Windows. The gsprint utility is faster than ghostscript to print
;; monochrome PostScript.
;; 5. You can use gsprint instead of ghostscript to print monochrome PostScript
;; files in Windows. The gsprint utility documentation says that it is more
;; efficient than ghostscript to print monochrome PostScript.
;;
;; To print non-monochrome PostScript file, the efficiency of ghostscript
;; is similar to gsprint.
@ -271,6 +271,31 @@ Please send all bug fixes and enhancements to
;; For more information about gsprint see
;; `http://www.cs.wisc.edu/~ghost/gsview/gsprint.htm'.
;;
;; As an example of gsprint declaration:
;;
;; (setq pr-ps-printer-alist
;; '((A "gsprint" ("-all" "-twoup") "-printer " "my-b/w-printer-name")
;; (B "gsprint" ("-all" "-twoup") nil "-printer my-b/w-printer-name")
;; ;; some other printer declaration
;; ))
;;
;; The example above declares that printer A prints all pages (-all) and two
;; pages per sheet (-twoup). The printer B declaration does the same as the
;; printer A declaration, the only difference is the printer name selection.
;;
;; There are other command line options like:
;;
;; -mono Render in monochrome as 1bit/pixel (only black and white).
;; -grey Render in greyscale as 8bits/pixel.
;; -color Render in color as 24bits/pixel.
;;
;; The default is `-mono'. So, printer A and B in the example above are
;; using implicitly the `-mono' option. Note that in `-mono' no gray tone
;; or color is printed, this includes the zebra stripes, that is, in `-mono'
;; the zebra stripes are not printed.
;;
;; See also documentation for `pr-ps-printer-alist'.
;;
;;
;; Using `printing'
;; ----------------
@ -279,8 +304,10 @@ Please send all bug fixes and enhancements to
;; using Windows 9x/NT or MS-DOS):
;;
;; (require 'printing)
;; ;; ...some user settings...
;; (pr-update-menus t)
;;
;; When `printing' is loaded:
;; During `pr-update-menus' evaluation:
;; * On Emacs 20:
;; it replaces the Tools/Print menu by Tools/Printing menu.
;; * On Emacs 21:
@ -885,6 +912,7 @@ Please send all bug fixes and enhancements to
;; (lps_06b "print" nil nil "\\\\printers\\lps_06b")
;; (lps_07c "print" nil "" "/D:\\\\printers\\lps_07c")
;; (lps_08c nil nil nil "\\\\printers\\lps_08c")
;; (b/w "gsprint" ("-all" "-twoup") "-printer " "b/w-pr-name")
;; (LPT1 "" nil "" "LPT1:")
;; (PRN "" nil "" "PRN")
;; (standard "redpr.exe" nil "" "")
@ -923,6 +951,9 @@ Please send all bug fixes and enhancements to
;;
;; `pr-update-menus' Update utility, PostScript and text printer menus.
;;
;; `pr-menu-bind' Install `printing' menu in the menubar.
;;
;;
;; Below are some URL where you can find good utilities.
;;
;; * For `printing' package:
@ -934,7 +965,7 @@ Please send all bug fixes and enhancements to
;;
;; gs, gv `http://www.gnu.org/software/ghostscript/ghostscript.html'
;; enscript `http://people.ssh.fi/mtr/genscript/'
;; psnup `http://www.dcs.ed.ac.uk/home/ajcd/psutils/index.html'
;; psnup `http://www.knackered.org/angus/psutils/'
;; mpage `http://www.mesa.nl/pub/mpage/'
;;
;; * For Windows system:
@ -943,7 +974,7 @@ Please send all bug fixes and enhancements to
;; `http://www.gnu.org/software/ghostscript/ghostscript.html'
;; gsprint `http://www.cs.wisc.edu/~ghost/gsview/gsprint.htm'.
;; enscript `http://people.ssh.fi/mtr/genscript/'
;; psnup `http://www.dcs.ed.ac.uk/home/ajcd/psutils/index.html'
;; psnup `http://gnuwin32.sourceforge.net/packages/psutils.htm'
;; redmon `http://www.cs.wisc.edu/~ghost/redmon/'
;;
;;
@ -1400,7 +1431,27 @@ Examples:
(prt_07c nil nil \"/D:\\\\\\\\printers\\\\prt_07c\")
(PRN \"\" nil \"PRN\")
(standard \"redpr.exe\" nil \"\")
)"
)
Useful links:
* Information about the print command (print.exe)
`http://www.computerhope.com/printhlp.htm'
* RedMon - Redirection Port Monitor (redpr.exe)
`http://www.cs.wisc.edu/~ghost/redmon/index.htm'
* Redirection Port Monitor (redpr.exe on-line help)
`http://www.cs.wisc.edu/~ghost/redmon/en/redmon.htm'
* UNIX man pages: lpr (or type `man lpr')
`http://bama.ua.edu/cgi-bin/man-cgi?lpr'
`http://www.mediacollege.com/cgi-bin/man/page.cgi?section=all&topic=lpr'
* UNIX man pages: lp (or type `man lp')
`http://bama.ua.edu/cgi-bin/man-cgi?lp'
`http://www.mediacollege.com/cgi-bin/man/page.cgi?section=all&topic=lp'
"
:type '(repeat
(list :tag "Text Printer"
(symbol :tag "Printer Symbol Name")
@ -1448,6 +1499,7 @@ function (see it for documentation) to update PostScript printer menu."
;; (lps_06b "print" nil nil "\\\\printers\\lps_06b")
;; (lps_07c "print" nil "" "/D:\\\\printers\\lps_07c")
;; (lps_08c nil nil nil "\\\\printers\\lps_08c")
;; (b/w "gsprint" ("-all" "-twoup") "-printer " "b/w-pr-name")
;; (LPT1 "" nil "" "LPT1:")
;; (PRN "" nil "" "PRN")
;; (standard "redpr.exe" nil "" "")
@ -1486,6 +1538,7 @@ COMMAND Name of the program for printing a PostScript file. On MS-DOS
\"lpr\"
\"lp\"
\"cp\"
\"gsprint\"
SWITCHES List of sexp's to pass as extra options for PostScript printer
program. It is recommended to set NAME (see text below)
@ -1495,6 +1548,9 @@ SWITCHES List of sexp's to pass as extra options for PostScript printer
'(\"-#3\" \"-l\")
nil
. for gsprint.exe
'(\"-all\" \"-twoup\")
PRINTER-SWITCH A string that specifies PostScript printer name switch. If
it's necessary to have a space between PRINTER-SWITCH and NAME,
it should be inserted at the end of PRINTER-SWITCH string.
@ -1511,6 +1567,9 @@ PRINTER-SWITCH A string that specifies PostScript printer name switch. If
. for print.exe
\"/D:\"
. for gsprint.exe
\"-printer \"
NAME A string that specifies a PostScript printer name.
On Unix-like systems, a string value should be a name
understood by lpr's -P option (or lp's -d option).
@ -1526,7 +1585,7 @@ NAME A string that specifies a PostScript printer name.
. for cp.exe
\"\\\\\\\\host\\\\share-name\"
. for print.exe
. for print.exe or gsprint.exe
\"/D:\\\\\\\\host\\\\share-name\"
\"\\\\\\\\host\\\\share-name\"
\"LPT1:\"
@ -1575,10 +1634,80 @@ Examples:
(lps_06b \"print\" nil nil \"\\\\\\\\printers\\\\lps_06b\")
(lps_07c \"print\" nil \"\" \"/D:\\\\\\\\printers\\\\lps_07c\")
(lps_08c nil nil nil \"\\\\\\\\printers\\\\lps_08c\")
(b/w1 \"gsprint\" (\"-all\" \"-twoup\") \"-printer \" \"b/w-pr-name\")
(b/w2 \"gsprint\" (\"-all\" \"-twoup\") nil \"-printer \\\\\\\\printers\\\\lps_06a\")
(LPT1 \"\" nil \"\" \"LPT1:\")
(PRN \"\" nil \"\" \"PRN\")
(standard \"redpr.exe\" nil \"\" \"\")
)"
)
gsprint:
You can use gsprint instead of ghostscript to print monochrome PostScript files
in Windows. The gsprint utility documentation says that it is more efficient
than ghostscript to print monochrome PostScript.
To print non-monochrome PostScript file, the efficiency of ghostscript is
similar to gsprint.
Also the gsprint utility comes together with gsview distribution.
As an example of gsprint declaration:
(setq pr-ps-printer-alist
'((A \"gsprint\" (\"-all\" \"-twoup\") \"-printer \" \"lps_015\")
(B \"gsprint\" (\"-all\" \"-twoup\") nil \"-printer lps_015\")
;; some other printer declaration
))
The example above declares that printer A prints all pages (-all) and two pages
per sheet (-twoup). The printer B declaration does the same as the printer A
declaration, the only difference is the printer name selection.
There are other command line options like:
-mono Render in monochrome as 1bit/pixel (only black and white).
-grey Render in greyscale as 8bits/pixel.
-color Render in color as 24bits/pixel.
The default is `-mono'. So, printer A and B in the example above are using
implicitly the `-mono' option. Note that in `-mono' no gray tone or color is
printed, this includes the zebra stripes, that is, in `-mono' the zebra stripes
are not printed.
Useful links:
* GSPRINT - Ghostscript print to Windows printer
`http://www.cs.wisc.edu/~ghost/gsview/gsprint.htm'
* Introduction to Ghostscript
`http://www.cs.wisc.edu/~ghost/doc/intro.htm'
* How to use Ghostscript
`http://www.cs.wisc.edu/~ghost/doc/cvs/Use.htm'
* Information about the print command (print.exe)
`http://www.computerhope.com/printhlp.htm'
* RedMon - Redirection Port Monitor (redpr.exe)
`http://www.cs.wisc.edu/~ghost/redmon/index.htm'
* Redirection Port Monitor (redpr.exe on-line help)
`http://www.cs.wisc.edu/~ghost/redmon/en/redmon.htm'
* UNIX man pages: lpr (or type `man lpr')
`http://bama.ua.edu/cgi-bin/man-cgi?lpr'
`http://www.mediacollege.com/cgi-bin/man/page.cgi?section=all&topic=lpr'
* UNIX man pages: lp (or type `man lp')
`http://bama.ua.edu/cgi-bin/man-cgi?lp'
`http://www.mediacollege.com/cgi-bin/man/page.cgi?section=all&topic=lp'
* GNU utilities for Win32 (cp.exe)
`http://unxutils.sourceforge.net/'
"
:type '(repeat
(list
:tag "PostScript Printer"
@ -1674,7 +1803,37 @@ See also `pr-temp-dir' and `pr-ps-temp-file'."
"gv")
"*Specify path and name of the gsview/gv utility.
See also `pr-path-alist'."
See also `pr-path-alist'.
Useful links:
* GNU gv manual
`http://www.gnu.org/software/gv/manual/gv.html'
* GSview Help
`http://www.cs.wisc.edu/~ghost/gsview/gsviewen.htm'
* GSview Help - Common Problems
`http://www.cs.wisc.edu/~ghost/gsview/gsviewen.htm#Common_Problems'
* GSview Readme (compilation & installation)
`http://www.cs.wisc.edu/~ghost/gsview/Readme.htm'
* GSview (main site)
`http://www.cs.wisc.edu/~ghost/gsview/index.htm'
* Ghostscript, Ghostview and GSview
`http://www.cs.wisc.edu/~ghost/'
* Ghostview
`http://www.cs.wisc.edu/~ghost/gv/index.htm'
* gv 3.5, June 1997
`http://www.cs.wisc.edu/~ghost/gv/gv_doc/gv.html'
* MacGSView (MacOS)
`http://www.cs.wisc.edu/~ghost/macos/index.htm'
"
:type '(string :tag "Ghostview Utility")
:version "20"
:group 'printing)
@ -1686,7 +1845,22 @@ See also `pr-path-alist'."
"gs")
"*Specify path and name of the ghostscript utility.
See also `pr-path-alist'."
See also `pr-path-alist'.
Useful links:
* Ghostscript, Ghostview and GSview
`http://www.cs.wisc.edu/~ghost/'
* Introduction to Ghostscript
`http://www.cs.wisc.edu/~ghost/doc/intro.htm'
* How to use Ghostscript
`http://www.cs.wisc.edu/~ghost/doc/cvs/Use.htm'
* Printer compatibility
`http://www.cs.wisc.edu/~ghost/doc/printer.htm'
"
:type '(string :tag "Ghostscript Utility")
:version "20"
:group 'printing)
@ -1717,7 +1891,19 @@ To see ghostscript documentation for more information:
- for full documentation, see in a browser the file
c:/gstools/gs5.50/index.html, that is, the file index.html which is
located in the same directory as gswin32.exe.
- for brief documentation, type: gswin32.exe -h"
- for brief documentation, type: gswin32.exe -h
Useful links:
* Introduction to Ghostscript
`http://www.cs.wisc.edu/~ghost/doc/intro.htm'
* How to use Ghostscript
`http://www.cs.wisc.edu/~ghost/doc/cvs/Use.htm'
* Printer compatibility
`http://www.cs.wisc.edu/~ghost/doc/printer.htm'
"
:type '(repeat (string :tag "Ghostscript Switch"))
:version "20"
:group 'printing)
@ -2184,7 +2370,35 @@ Examples:
'((psnup \"c:/psutils/psnup\" (\"-q\") \"-P%s\" \"-%d\" \"-l\" nil nil \" \"
nil (pr-file-duplex . nil) (pr-file-tumble . nil))
)"
)
Useful links:
* mpage download (GNU or Unix)
`http://www.mesa.nl/pub/mpage/'
* mpage documentation (GNU or Unix - or type `man mpage')
`http://www.cs.umd.edu/faq/guides/manual_unix/node48.html'
`http://www.rt.com/man/mpage.1.html'
* psnup (Windows, GNU or Unix)
`http://www.knackered.org/angus/psutils/'
`http://gershwin.ens.fr/vdaniel/Doc-Locale/Outils-Gnu-Linux/PsUtils/'
* psnup (PsUtils for Windows)
`http://gnuwin32.sourceforge.net/packages/psutils.htm'
* psnup documentation (GNU or Unix - or type `man psnup')
`http://linux.about.com/library/cmd/blcmdl1_psnup.htm'
`http://amath.colorado.edu/computing/software/man/psnup.html'
* GNU Enscript (Windows, GNU or Unix)
`http://people.ssh.com/mtr/genscript/'
* GNU Enscript documentation (Windows, GNU or Unix)
`http://people.ssh.com/mtr/genscript/enscript.man.html'
(on GNU or Unix, type `man enscript')
"
:type '(repeat
(list :tag "PS File Utility"
(symbol :tag "Utility Symbol")
@ -2845,43 +3059,65 @@ See `pr-ps-printer-alist'.")
)))
(cond
((featurep 'xemacs) ; XEmacs
;; Menu binding
(pr-xemacs-global-menubar
(pr-x-add-submenu nil (cons "Printing" pr-menu-spec) "Apps")))
(defvar pr-menu-print-item "print"
"Non-nil means that menu binding was not done.
Used by `pr-menu-bind' and `pr-update-menus'.")
(t ; GNU Emacs
;; Menu binding
(require 'easymenu)
;; Replace existing "print" item by "Printing" item.
;; If you're changing this file, you'll load it a second,
;; third... time, but "print" item exists only in the first load.
(defvar pr-menu-print-item "print")
(defun pr-menu-bind ()
"Install `printing' menu in the menubar.
On Emacs 20, it replaces the Tools/Print menu by Tools/Printing menu.
On Emacs 21 and 22, it replaces the File/Print* menu entries by File/Print
menu.
Calls `pr-update-menus' to adjust menus."
(interactive)
(cond
;; Emacs 20
((string< emacs-version "21.")
(easy-menu-change '("tools") "Printing" pr-menu-spec pr-menu-print-item)
(when pr-menu-print-item
(easy-menu-remove-item nil '("tools") pr-menu-print-item)
(setq pr-menu-print-item nil
pr-menu-bar (vector 'menu-bar 'tools
(pr-get-symbol "Printing")))))
;; Emacs 21
(pr-menu-print-item
(easy-menu-change '("file") "Print" pr-menu-spec "print-buffer")
(let ((items '("print-buffer" "print-region"
"ps-print-buffer-faces" "ps-print-region-faces"
"ps-print-buffer" "ps-print-region")))
(while items
(easy-menu-remove-item nil '("file") (car items))
(setq items (cdr items)))
(setq pr-menu-print-item nil
pr-menu-bar (vector 'menu-bar 'file
(pr-get-symbol "Print")))))
(t
(easy-menu-change '("file") "Print" pr-menu-spec)))))
((featurep 'xemacs) ; XEmacs
;; Menu binding
(pr-xemacs-global-menubar
(pr-x-add-submenu nil (cons "Printing" pr-menu-spec) "Apps"))
(setq pr-menu-print-item nil))
(t ; GNU Emacs
;; Menu binding
(require 'easymenu)
;; Replace existing "print" item by "Printing" item.
;; If you're changing this file, you'll load it a second,
;; third... time, but "print" item exists only in the first load.
(cond
;; Emacs 20
((string< emacs-version "21.")
(easy-menu-change '("tools") "Printing" pr-menu-spec pr-menu-print-item)
(when pr-menu-print-item
(easy-menu-remove-item nil '("tools") pr-menu-print-item)
(setq pr-menu-print-item nil
pr-menu-bar (vector 'menu-bar 'tools
(pr-get-symbol "Printing")))))
;; Emacs 21 & 22
(t
(let* ((has-file (lookup-key global-map (vector 'menu-bar 'file)))
(item-file (if has-file '("file") '("files"))))
(cond
(pr-menu-print-item
(easy-menu-change item-file "Print" pr-menu-spec "print-buffer")
(let ((items '("print-buffer" "print-region"
"ps-print-buffer-faces" "ps-print-region-faces"
"ps-print-buffer" "ps-print-region")))
(while items
(easy-menu-remove-item nil item-file (car items))
(setq items (cdr items)))
(setq pr-menu-print-item nil
pr-menu-bar (vector 'menu-bar
(if has-file 'file 'files)
(pr-get-symbol "Print")))))
(t
(easy-menu-change item-file "Print" pr-menu-spec))))))))
(pr-update-menus t))
;; Key binding
@ -4712,12 +4948,20 @@ If FORCE is non-nil, update menus doesn't matter if `pr-ps-printer-alist',
otherwise, update PostScript printer menu iff `pr-ps-printer-menu-modified' is
non-nil, update text printer menu iff `pr-txt-printer-menu-modified' is
non-nil, and update PostScript File menus iff `pr-ps-utility-menu-modified' is
non-nil."
non-nil.
If menu binding was not done, calls `pr-menu-bind'."
(interactive "P")
(pr-update-var 'pr-ps-name pr-ps-printer-alist)
(pr-update-var 'pr-txt-name pr-txt-printer-alist)
(pr-update-var 'pr-ps-utility pr-ps-utility-alist)
(pr-do-update-menus force))
(if pr-menu-print-item ; since v6.8.4
;; There was no menu binding yet, so do it now!
;; This is a hack to be compatible with old versions of printing.
;; So, user does not need to change printing calling in init files.
(pr-menu-bind)
;; Here menu binding is ok.
(pr-update-var 'pr-ps-name pr-ps-printer-alist)
(pr-update-var 'pr-txt-name pr-txt-printer-alist)
(pr-update-var 'pr-ps-utility pr-ps-utility-alist)
(pr-do-update-menus force)))
(defvar pr-ps-printer-menu-modified t
@ -6434,10 +6678,6 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Files are not supposed to change Emacs behavior when you merely load them.
;;; (pr-update-menus t)
(provide 'printing)

6
lisp/progmodes/ada-mode.el
View file

@ -1462,7 +1462,7 @@ The standard casing rules will no longer apply to this word."
(setq file-name (car ada-case-exception-file)))
(t
(error (concat "No exception file specified. "
"See variable ada-case-exception-file."))))
"See variable ada-case-exception-file"))))
(set-syntax-table ada-mode-symbol-syntax-table)
(unless word
@ -1501,7 +1501,7 @@ word itself has a special casing."
(car ada-case-exception-file))
(t
(error (concat "No exception file specified. "
"See variable ada-case-exception-file."))))))
"See variable ada-case-exception-file"))))))
;; Find the substring to define as an exception. Order is: the parameter,
;; if any, or the selected region, or the word under the cursor
@ -5398,7 +5398,7 @@ This function typically is to be hooked into `ff-file-created-hooks'."
(setq body-file (ada-get-body-name))
(if body-file
(find-file body-file)
(error "No body found for the package. Create it first."))
(error "No body found for the package. Create it first"))
(save-restriction
(widen)

94
lisp/progmodes/antlr-mode.el
View file

@ -1,6 +1,6 @@
;;; antlr-mode.el --- major mode for ANTLR grammar files
;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
;;
;; Author: Christoph.Wedler@sap.com
;; Keywords: languages, ANTLR, code generator
@ -827,58 +827,72 @@ font-lock keywords according to `font-lock-defaults' used for the code
in the grammar's actions and semantic predicates, see
`antlr-font-lock-maximum-decoration'.")
(defvar antlr-font-lock-default-face 'antlr-font-lock-default-face)
(defface antlr-font-lock-default-face nil
(defvar antlr-default-face 'antlr-default)
(defface antlr-default
"Face to prevent strings from language dependent highlighting.
Do not change."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-default-face 'face-alias 'antlr-default)
(defvar antlr-font-lock-keyword-face 'antlr-font-lock-keyword-face)
(defface antlr-font-lock-keyword-face
(defvar antlr-keyword-face 'antlr-keyword)
(defface antlr-keyword
(cond-emacs-xemacs
'((((class color) (background light))
(:foreground "black" :EMACS :weight bold :XEMACS :bold t))))
"ANTLR keywords."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-keyword-face 'face-alias 'antlr-keyword)
(defvar antlr-font-lock-syntax-face 'antlr-font-lock-keyword-face)
(defface antlr-font-lock-syntax-face
(defvar antlr-syntax-face 'antlr-keyword)
(defface antlr-syntax
(cond-emacs-xemacs
'((((class color) (background light))
(:foreground "black" :EMACS :weight bold :XEMACS :bold t))))
"ANTLR syntax symbols like :, |, (, ), ...."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-syntax-face 'face-alias 'antlr-syntax)
(defvar antlr-font-lock-ruledef-face 'antlr-font-lock-ruledef-face)
(defface antlr-font-lock-ruledef-face
(defvar antlr-ruledef-face 'antlr-ruledef)
(defface antlr-ruledef
(cond-emacs-xemacs
'((((class color) (background light))
(:foreground "blue" :EMACS :weight bold :XEMACS :bold t))))
"ANTLR rule references (definition)."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-ruledef-face 'face-alias 'antlr-ruledef)
(defvar antlr-font-lock-tokendef-face 'antlr-font-lock-tokendef-face)
(defface antlr-font-lock-tokendef-face
(defvar antlr-tokendef-face 'antlr-tokendef)
(defface antlr-tokendef
(cond-emacs-xemacs
'((((class color) (background light))
(:foreground "blue" :EMACS :weight bold :XEMACS :bold t))))
"ANTLR token references (definition)."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-tokendef-face 'face-alias 'antlr-tokendef)
(defvar antlr-font-lock-ruleref-face 'antlr-font-lock-ruleref-face)
(defface antlr-font-lock-ruleref-face
(defvar antlr-ruleref-face 'antlr-ruleref)
(defface antlr-ruleref
'((((class color) (background light)) (:foreground "blue4")))
"ANTLR rule references (usage)."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-ruleref-face 'face-alias 'antlr-ruleref)
(defvar antlr-font-lock-tokenref-face 'antlr-font-lock-tokenref-face)
(defface antlr-font-lock-tokenref-face
(defvar antlr-tokenref-face 'antlr-tokenref)
(defface antlr-tokenref
'((((class color) (background light)) (:foreground "orange4")))
"ANTLR token references (usage)."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-tokenref-face 'face-alias 'antlr-tokenref)
(defvar antlr-font-lock-literal-face 'antlr-font-lock-literal-face)
(defface antlr-font-lock-literal-face
(defvar antlr-literal-face 'antlr-literal)
(defface antlr-literal
(cond-emacs-xemacs
'((((class color) (background light))
(:foreground "brown4" :EMACS :weight bold :XEMACS :bold t))))
@ -886,6 +900,8 @@ Do not change."
It is used to highlight strings matched by the first regexp group of
`antlr-font-lock-literal-regexp'."
:group 'antlr)
;; backward-compatibility alias
(put 'antlr-font-lock-literal-face 'face-alias 'antlr-literal)
(defcustom antlr-font-lock-literal-regexp "\"\\(\\sw\\(\\sw\\|-\\)*\\)\""
"Regexp matching literals with special syntax highlighting, or nil.
@ -904,56 +920,56 @@ group. The string matched by the first group is highlighted with
(cond-emacs-xemacs
`((antlr-invalidate-context-cache)
("\\$setType[ \t]*(\\([A-Za-z\300-\326\330-\337]\\sw*\\))"
(1 antlr-font-lock-tokendef-face))
("\\$\\sw+" (0 font-lock-keyword-face))
(1 antlr-tokendef-face))
("\\$\\sw+" (0 keyword-face))
;; the tokens are already fontified as string/docstrings:
(,(lambda (limit)
(if antlr-font-lock-literal-regexp
(if antlr-literal-regexp
(antlr-re-search-forward antlr-font-lock-literal-regexp limit)))
(1 antlr-font-lock-literal-face t)
(1 antlr-literal-face t)
:XEMACS (0 nil)) ; XEmacs bug workaround
(,(lambda (limit)
(antlr-re-search-forward antlr-class-header-regexp limit))
(1 antlr-font-lock-keyword-face)
(2 antlr-font-lock-ruledef-face)
(3 antlr-font-lock-keyword-face)
(1 antlr-keyword-face)
(2 antlr-ruledef-face)
(3 antlr-keyword-face)
(4 (if (member (match-string 4) '("Lexer" "Parser" "TreeParser"))
'antlr-font-lock-keyword-face
'font-lock-type-face)))
antlr-keyword-face
type-face)))
(,(lambda (limit)
(antlr-re-search-forward
"\\<\\(header\\|options\\|tokens\\|exception\\|catch\\|returns\\)\\>"
limit))
(1 antlr-font-lock-keyword-face))
(1 antlr-keyword-face))
(,(lambda (limit)
(antlr-re-search-forward
"^\\(private\\|public\\|protected\\)\\>[ \t]*\\(\\(\\sw+[ \t]*\\(:\\)?\\)\\)?"
limit))
(1 font-lock-type-face) ; not XEmacs' java level-3 fruit salad
(3 (if (antlr-upcase-p (char-after (match-beginning 3)))
'antlr-font-lock-tokendef-face
'antlr-font-lock-ruledef-face) nil t)
(4 antlr-font-lock-syntax-face nil t))
antlr-tokendef-face
antlr-ruledef-face) nil t)
(4 antlr-syntax-face nil t))
(,(lambda (limit)
(antlr-re-search-forward "^\\(\\sw+\\)[ \t]*\\(:\\)?" limit))
(1 (if (antlr-upcase-p (char-after (match-beginning 0)))
'antlr-font-lock-tokendef-face
'antlr-font-lock-ruledef-face) nil t)
(2 antlr-font-lock-syntax-face nil t))
antlr-tokendef-face
antlr-ruledef-face) nil t)
(2 antlr-syntax-face nil t))
(,(lambda (limit)
;; v:ruleref and v:"literal" is allowed...
(antlr-re-search-forward "\\(\\sw+\\)[ \t]*\\([=:]\\)?" limit))
(1 (if (match-beginning 2)
(if (eq (char-after (match-beginning 2)) ?=)
'antlr-font-lock-default-face
'font-lock-variable-name-face)
antlr-default-face
font-lock-variable-name-face)
(if (antlr-upcase-p (char-after (match-beginning 1)))
'antlr-font-lock-tokenref-face
'antlr-font-lock-ruleref-face)))
(2 antlr-font-lock-default-face nil t))
antlr-tokenref-face
antlr-ruleref-face)))
(2 antlr-default-face nil t))
(,(lambda (limit)
(antlr-re-search-forward "[|&:;(~]\\|)\\([*+?]\\|=>\\)?" limit))
(0 'antlr-font-lock-syntax-face))))
(0 antlr-syntax-face))))
"Font-lock keywords for ANTLR's normal grammar code.
See `antlr-font-lock-keywords-alist' for the keywords of actions.")

16
lisp/progmodes/compile.el
View file

@ -246,8 +246,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
" in \\([^()\n ]+\\)(\\([0-9]+\\))$" 1 2)
(msft
"^\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \
: \\(?:error\\|warnin\\(g\\)\\) C[0-9]+:" 1 2 nil (3))
"^\\([0-9]+>\\)?\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \
: \\(?:error\\|warnin\\(g\\)\\) C[0-9]+:" 2 3 nil (4))
(oracle
"^\\(?:Semantic error\\|Error\\|PCC-[0-9]+:\\).* line \\([0-9]+\\)\
@ -468,15 +468,17 @@ starting the compilation process.")
;; History of compile commands.
(defvar compile-history nil)
(defface compilation-warning-face
(defface compilation-warning
'((((class color) (min-colors 16)) (:foreground "Orange" :weight bold))
(((class color)) (:foreground "cyan" :weight bold))
(t (:weight bold)))
"Face used to highlight compiler warnings."
:group 'font-lock-highlighting-faces
:version "22.1")
;; backward-compatibility alias
(put 'compilation-warning-face 'face-alias 'compilation-warning)
(defface compilation-info-face
(defface compilation-info
'((((class color) (min-colors 16) (background light))
(:foreground "Green3" :weight bold))
(((class color) (min-colors 88) (background dark))
@ -488,6 +490,8 @@ starting the compilation process.")
"Face used to highlight compiler warnings."
:group 'font-lock-highlighting-faces
:version "22.1")
;; backward-compatibility alias
(put 'compilation-info-face 'face-alias 'compilation-info)
(defvar compilation-message-face nil
"Face name to use for whole messages.
@ -498,10 +502,10 @@ Faces `compilation-error-face', `compilation-warning-face',
(defvar compilation-error-face 'font-lock-warning-face
"Face name to use for file name in error messages.")
(defvar compilation-warning-face 'compilation-warning-face
(defvar compilation-warning-face 'compilation-warning
"Face name to use for file name in warning messages.")
(defvar compilation-info-face 'compilation-info-face
(defvar compilation-info-face 'compilation-info
"Face name to use for file name in informational messages.")
(defvar compilation-line-face 'font-lock-variable-name-face

113
lisp/progmodes/cperl-mode.el
View file

@ -343,7 +343,7 @@ Affects: `cperl-font-lock', `cperl-electric-lbrace-space',
:group 'cperl-indentation-details)
(defvar cperl-vc-header-alist nil)
(make-obsolete-variable
(make-obsolete-variable
'cperl-vc-header-alist
"use cperl-vc-rcs-header or cperl-vc-sccs-header instead.")
@ -369,7 +369,7 @@ Affects: `cperl-font-lock', `cperl-electric-lbrace-space',
(defcustom cperl-info-on-command-no-prompt nil
"*Not-nil (and non-null) means not to prompt on C-h f.
The opposite behaviour is always available if prefixed with C-c.
The opposite behavior is always available if prefixed with C-c.
Can be overwritten by `cperl-hairy' if nil."
:type '(choice (const null) boolean)
:group 'cperl-affected-by-hairy)
@ -564,11 +564,11 @@ when syntaxifying a chunk of buffer."
(font-lock-variable-name-face nil nil bold)
(font-lock-function-name-face nil nil bold italic box)
(font-lock-constant-face nil "LightGray" bold)
(cperl-array-face nil "LightGray" bold underline)
(cperl-hash-face nil "LightGray" bold italic underline)
(cperl-array nil "LightGray" bold underline)
(cperl-hash nil "LightGray" bold italic underline)
(font-lock-comment-face nil "LightGray" italic)
(font-lock-string-face nil nil italic underline)
(cperl-nonoverridable-face nil nil italic underline)
(cperl-nonoverridable nil nil italic underline)
(font-lock-type-face nil nil underline)
(underline nil "LightGray" strikeout))
"List given as an argument to `ps-extend-face-list' in `cperl-ps-print'."
@ -583,7 +583,7 @@ when syntaxifying a chunk of buffer."
(defvar cperl-dark-foreground
(cperl-choose-color "orchid1" "orange"))
(defface cperl-nonoverridable-face
(defface cperl-nonoverridable
`((((class grayscale) (background light))
(:background "Gray90" :slant italic :underline t))
(((class grayscale) (background dark))
@ -595,8 +595,10 @@ when syntaxifying a chunk of buffer."
(t (:weight bold :underline t)))
"Font Lock mode face used non-overridable keywords and modifiers of regexps."
:group 'cperl-faces)
;; backward-compatibility alias
(put 'cperl-nonoverridable-face 'face-alias 'cperl-nonoverridable)
(defface cperl-array-face
(defface cperl-array
`((((class grayscale) (background light))
(:background "Gray90" :weight bold))
(((class grayscale) (background dark))
@ -608,8 +610,10 @@ when syntaxifying a chunk of buffer."
(t (:weight bold)))
"Font Lock mode face used to highlight array names."
:group 'cperl-faces)
;; backward-compatibility alias
(put 'cperl-array-face 'face-alias 'cperl-array)
(defface cperl-hash-face
(defface cperl-hash
`((((class grayscale) (background light))
(:background "Gray90" :weight bold :slant italic))
(((class grayscale) (background dark))
@ -621,6 +625,8 @@ when syntaxifying a chunk of buffer."
(t (:weight bold :slant italic)))
"Font Lock mode face used to highlight hash names."
:group 'cperl-faces)
;; backward-compatibility alias
(put 'cperl-hash-face 'face-alias 'cperl-hash)
@ -867,8 +873,8 @@ B) Speed of editing operations.
(defvar cperl-tips-faces 'please-ignore-this-line
"CPerl mode uses following faces for highlighting:
`cperl-array-face' Array names
`cperl-hash-face' Hash names
`cperl-array' Array names
`cperl-hash' Hash names
`font-lock-comment-face' Comments, PODs and whatever is considered
syntaxically to be not code
`font-lock-constant-face' HERE-doc delimiters, labels, delimiters of
@ -879,7 +885,7 @@ B) Speed of editing operations.
(except those conflicting with Perl operators),
package names (when recognized), format names
`font-lock-keyword-face' Control flow switch constructs, declarators
`cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen
`cperl-nonoverridable' Non-overridable keywords, modifiers of RExen
`font-lock-string-face' Strings, qw() constructs, RExen, POD sections,
literal parts and the terminator of formats
and whatever is syntaxically considered
@ -887,7 +893,7 @@ B) Speed of editing operations.
`font-lock-type-face' Overridable keywords
`font-lock-variable-name-face' Variable declarations, indirect array and
hash names, POD headers/item names
`cperl-invalid-face' Trailing whitespace
`cperl-invalid' Trailing whitespace
Note that in several situations the highlighting tries to inform about
possible confusion, such as different colors for function names in
@ -1303,7 +1309,7 @@ you type it inside the inline block of control construct, like
and you are on a boundary of a statement inside braces, it will
transform the construct into a multiline and will place you into an
appropriately indented blank line. If you need a usual
`newline-and-indent' behaviour, it is on \\[newline-and-indent],
`newline-and-indent' behavior, it is on \\[newline-and-indent],
see documentation on `cperl-electric-linefeed'.
Use \\[cperl-invert-if-unless] to change a construction of the form
@ -1481,7 +1487,7 @@ or as help on variables `cperl-tips', `cperl-problems',
(make-local-variable 'comment-start-skip)
(setq comment-start-skip "#+ *")
(make-local-variable 'defun-prompt-regexp)
(setq defun-prompt-regexp "^[ \t]*sub[ \t\n]+\\([^ \t\n{(;]+\\)\\([ \t\n]*([^()]*)[ \t\n]*\\)?[ \t\n]*)")
(setq defun-prompt-regexp "^[ \t]*sub[ \t\n]+\\([^ \t\n{(;]+\\)\\([ \t\n]*([^()]*)[ \t\n]*\\)?[ \t\n]*")
(make-local-variable 'comment-indent-function)
(setq comment-indent-function 'cperl-comment-indent)
(make-local-variable 'parse-sexp-ignore-comments)
@ -3167,7 +3173,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
(cperl-nonoverridable-face
(if (boundp 'cperl-nonoverridable-face)
cperl-nonoverridable-face
'cperl-nonoverridable-face))
'cperl-nonoverridable))
(stop-point (if ignore-max
(point-max)
max))
@ -3661,7 +3667,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
(forward-word 1) ; skip modifiers s///s
(if tail (cperl-commentify tail (point) t))
(cperl-postpone-fontification
e1 (point) 'face 'cperl-nonoverridable-face)))
e1 (point) 'face 'cperl-nonoverridable)))
;; Check whether it is m// which means "previous match"
;; and highlight differently
(setq is-REx
@ -4710,7 +4716,7 @@ indentation and initial hashes. Behaves usually outside of comment."
"u\\(se\\|n\\(shift\\|ti\\(l\\|e\\)\\|def\\|less\\)\\)\\|"
"while\\|y\\|__\\(END\\|DATA\\)__" ;__DATA__ added manually
"\\|[sm]" ; Added manually
"\\)\\>") 2 'cperl-nonoverridable-face)
"\\)\\>") 2 'cperl-nonoverridable)
;; (mapconcat 'identity
;; '("#endif" "#else" "#ifdef" "#ifndef" "#if"
;; "#include" "#define" "#undef")
@ -4773,15 +4779,15 @@ indentation and initial hashes. Behaves usually outside of comment."
'(
("\\(\\([@%]\\|\$#\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)" 1
(if (eq (char-after (match-beginning 2)) ?%)
cperl-hash-face
cperl-array-face)
'cperl-hash
'cperl-array)
t) ; arrays and hashes
("\\(\\([$@]+\\)[a-zA-Z_:][a-zA-Z0-9_:]*\\)[ \t]*\\([[{]\\)"
1
(if (= (- (match-end 2) (match-beginning 2)) 1)
(if (eq (char-after (match-beginning 3)) ?{)
cperl-hash-face
cperl-array-face) ; arrays and hashes
'cperl-hash
'cperl-array) ; arrays and hashes
font-lock-variable-name-face) ; Just to put something
t)
;;("\\([smy]\\|tr\\)\\([^a-z_A-Z0-9]\\)\\(\\([^\n\\]*||\\)\\)\\2")
@ -4854,21 +4860,21 @@ indentation and initial hashes. Behaves usually outside of comment."
[nil nil t t t]
nil
[nil nil t t t])
(list 'cperl-nonoverridable-face
(list 'cperl-nonoverridable
["chartreuse3" ("orchid1" "orange")
nil "Gray80"]
[nil nil "gray90"]
[nil nil nil t t]
[nil nil t t]
[nil nil t t t])
(list 'cperl-array-face
(list 'cperl-array
["blue" "yellow" nil "Gray80"]
["lightyellow2" ("navy" "os2blue" "darkgreen")
"gray90"]
t
nil
nil)
(list 'cperl-hash-face
(list 'cperl-hash
["red" "red" nil "Gray80"]
["lightyellow2" ("navy" "os2blue" "darkgreen")
"gray90"]
@ -4891,15 +4897,15 @@ indentation and initial hashes. Behaves usually outside of comment."
"Face for variable names")
(cperl-force-face font-lock-type-face
"Face for data types")
(cperl-force-face cperl-nonoverridable-face
(cperl-force-face cperl-nonoverridable
"Face for data types from another group")
(cperl-force-face font-lock-comment-face
"Face for comments")
(cperl-force-face font-lock-function-name-face
"Face for function names")
(cperl-force-face cperl-hash-face
(cperl-force-face cperl-hash
"Face for hashes")
(cperl-force-face cperl-array-face
(cperl-force-face cperl-array
"Face for arrays")
;;(defvar font-lock-constant-face 'font-lock-constant-face)
;;(defvar font-lock-variable-name-face 'font-lock-variable-name-face)
@ -4909,7 +4915,7 @@ indentation and initial hashes. Behaves usually outside of comment."
;; "Face to use for data types."))
;;(or (boundp 'cperl-nonoverridable-face)
;; (defconst cperl-nonoverridable-face
;; 'cperl-nonoverridable-face
;; 'cperl-nonoverridable
;; "Face to use for data types from another group."))
;;(if (not cperl-xemacs-p) nil
;; (or (boundp 'font-lock-comment-face)
@ -4925,26 +4931,24 @@ indentation and initial hashes. Behaves usually outside of comment."
;; 'font-lock-function-name-face
;; "Face to use for function names.")))
(if (and
(not (cperl-is-face 'cperl-array-face))
(not (cperl-is-face 'cperl-array))
(cperl-is-face 'font-lock-emphasized-face))
(copy-face 'font-lock-emphasized-face 'cperl-array-face))
(copy-face 'font-lock-emphasized-face 'cperl-array))
(if (and
(not (cperl-is-face 'cperl-hash-face))
(not (cperl-is-face 'cperl-hash))
(cperl-is-face 'font-lock-other-emphasized-face))
(copy-face 'font-lock-other-emphasized-face
'cperl-hash-face))
(copy-face 'font-lock-other-emphasized-face 'cperl-hash))
(if (and
(not (cperl-is-face 'cperl-nonoverridable-face))
(not (cperl-is-face 'cperl-nonoverridable))
(cperl-is-face 'font-lock-other-type-face))
(copy-face 'font-lock-other-type-face
'cperl-nonoverridable-face))
(copy-face 'font-lock-other-type-face 'cperl-nonoverridable))
;;(or (boundp 'cperl-hash-face)
;; (defconst cperl-hash-face
;; 'cperl-hash-face
;; 'cperl-hash
;; "Face to use for hashes."))
;;(or (boundp 'cperl-array-face)
;; (defconst cperl-array-face
;; 'cperl-array-face
;; 'cperl-array
;; "Face to use for arrays."))
;; Here we try to guess background
(let ((background
@ -4983,17 +4987,17 @@ indentation and initial hashes. Behaves usually outside of comment."
"pink")))
(t
(set-face-background 'font-lock-type-face "gray90"))))
(if (cperl-is-face 'cperl-nonoverridable-face)
(if (cperl-is-face 'cperl-nonoverridable)
nil
(copy-face 'font-lock-type-face 'cperl-nonoverridable-face)
(copy-face 'font-lock-type-face 'cperl-nonoverridable)
(cond
((eq background 'light)
(set-face-foreground 'cperl-nonoverridable-face
(set-face-foreground 'cperl-nonoverridable
(if (x-color-defined-p "chartreuse3")
"chartreuse3"
"chartreuse")))
((eq background 'dark)
(set-face-foreground 'cperl-nonoverridable-face
(set-face-foreground 'cperl-nonoverridable
(if (x-color-defined-p "orchid1")
"orchid1"
"orange")))))
@ -5045,20 +5049,15 @@ indentation and initial hashes. Behaves usually outside of comment."
'(setq ps-bold-faces
;; font-lock-variable-name-face
;; font-lock-constant-face
(append '(cperl-array-face
cperl-hash-face)
(append '(cperl-array cperl-hash)
ps-bold-faces)
ps-italic-faces
;; font-lock-constant-face
(append '(cperl-nonoverridable-face
cperl-hash-face)
(append '(cperl-nonoverridable cperl-hash)
ps-italic-faces)
ps-underlined-faces
;; font-lock-type-face
(append '(cperl-array-face
cperl-hash-face
underline
cperl-nonoverridable-face)
(append '(cperl-array cperl-hash underline cperl-nonoverridable)
ps-underlined-faces))))
(defvar ps-print-face-extension-alist)
@ -5091,27 +5090,27 @@ Style of printout regulated by the variable `cperl-ps-print-face-properties'."
;;; (defvar ps-italic-faces nil)
;;; (setq ps-bold-faces
;;; (append '(font-lock-emphasized-face
;;; cperl-array-face
;;; cperl-array
;;; font-lock-keyword-face
;;; font-lock-variable-name-face
;;; font-lock-constant-face
;;; font-lock-reference-face
;;; font-lock-other-emphasized-face
;;; cperl-hash-face)
;;; cperl-hash)
;;; ps-bold-faces))
;;; (setq ps-italic-faces
;;; (append '(cperl-nonoverridable-face
;;; (append '(cperl-nonoverridable
;;; font-lock-constant-face
;;; font-lock-reference-face
;;; font-lock-other-emphasized-face
;;; cperl-hash-face)
;;; cperl-hash)
;;; ps-italic-faces))
;;; (setq ps-underlined-faces
;;; (append '(font-lock-emphasized-face
;;; cperl-array-face
;;; cperl-array
;;; font-lock-other-emphasized-face
;;; cperl-hash-face
;;; cperl-nonoverridable-face font-lock-type-face)
;;; cperl-hash
;;; cperl-nonoverridable font-lock-type-face)
;;; ps-underlined-faces))
;;; (cons 'font-lock-type-face ps-underlined-faces))

4
lisp/progmodes/cpp.el
View file

@ -144,7 +144,7 @@ or a cons cell (background-color . COLOR)."
'("light gray" "light blue" "light cyan" "light yellow" "light pink"
"pale green" "beige" "orange" "magenta" "violet" "medium purple"
"turquoise")
"Background colours useful with dark foreground colors."
"Background colors useful with dark foreground colors."
:type '(repeat string)
:group 'cpp)
@ -152,7 +152,7 @@ or a cons cell (background-color . COLOR)."
'("dim gray" "blue" "cyan" "yellow" "red"
"dark green" "brown" "dark orange" "dark khaki" "dark violet" "purple"
"dark turquoise")
"Background colours useful with light foreground colors."
"Background colors useful with light foreground colors."
:type '(repeat string)
:group 'cpp)

4
lisp/progmodes/delphi.el
View file

@ -152,8 +152,8 @@ regardless of where in the line point is when the TAB command is used."
(defcustom delphi-newline-always-indents t
"*Non-nil means NEWLINE in Delphi mode should always reindent the current
line, insert a blank line and move to the default indent column of the blank
line. If nil, then no indentation occurs, and NEWLINE does the usual
behaviour. This is useful when one needs to do customized indentation that
line. If nil, then no indentation occurs, and NEWLINE does the usual
behavior. This is useful when one needs to do customized indentation that
differs from the default."
:type 'boolean
:group 'delphi)

46
lisp/progmodes/ebrowse.el
View file

@ -157,50 +157,64 @@ This space is used to display markers."
:group 'ebrowse)
(defface ebrowse-tree-mark-face
(defface ebrowse-tree-mark
'((((min-colors 88)) (:foreground "red1"))
(t (:foreground "red")))
"*The face used for the mark character in the tree."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-tree-mark-face 'face-alias 'ebrowse-tree-mark)
(defface ebrowse-root-class-face
(defface ebrowse-root-class
'((((min-colors 88)) (:weight bold :foreground "blue1"))
(t (:weight bold :foreground "blue")))
"*The face used for root classes in the tree."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-root-class-face 'face-alias 'ebrowse-root-class)
(defface ebrowse-file-name-face
(defface ebrowse-file-name
'((t (:italic t)))
"*The face for filenames displayed in the tree."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-file-name-face 'face-alias 'ebrowse-file-name)
(defface ebrowse-default-face
(defface ebrowse-default
'((t nil))
"*Face for everything else in the tree not having other faces."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-default-face 'face-alias 'ebrowse-default)
(defface ebrowse-member-attribute-face
(defface ebrowse-member-attribute
'((((min-colors 88)) (:foreground "red1"))
(t (:foreground "red")))
"*Face used to display member attributes."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-member-attribute-face 'face-alias 'ebrowse-member-attribute)
(defface ebrowse-member-class-face
(defface ebrowse-member-class
'((t (:foreground "purple")))
"*Face used to display the class title in member buffers."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-member-class-face 'face-alias 'ebrowse-member-class)
(defface ebrowse-progress-face
(defface ebrowse-progress
'((((min-colors 88)) (:background "blue1"))
(t (:background "blue")))
"*Face for progress indicator."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-progress-face 'face-alias 'ebrowse-progress)
@ -883,7 +897,7 @@ this is the first progress message displayed."
(message (concat title ": "
(propertize (make-string ebrowse-n-boxes
(if (display-color-p) ?\ ?+))
'face 'ebrowse-progress-face)))))
'face 'ebrowse-progress)))))
;;; Reading a tree from disk
@ -1310,7 +1324,7 @@ With PREFIX, insert that many filenames."
(ebrowse-ts-class tree))
"unknown")
")"))
(ebrowse-set-face start (point) 'ebrowse-file-name-face)
(ebrowse-set-face start (point) 'ebrowse-file-name)
(beginning-of-line)
(forward-line 1))))))
@ -1828,7 +1842,7 @@ TREE denotes the class shown."
start end
`(mouse-face highlight ebrowse-what mark ebrowse-tree ,tree
help-echo "double-mouse-1: mark/unmark"))
(ebrowse-set-face start end 'ebrowse-tree-mark-face))
(ebrowse-set-face start end 'ebrowse-tree-mark))
(defun* ebrowse-draw-tree-fn (&aux stack1 stack2 start)
@ -1855,8 +1869,8 @@ This function may look weird, but this is faster than recursion."
(when (ebrowse-template-p class)
(insert "<>"))
(ebrowse-set-face start (point) (if (zerop level)
'ebrowse-root-class-face
'ebrowse-default-face))
'ebrowse-root-class
'ebrowse-default))
(setf start-of-class-name start
end-of-class-name (point))
;; If filenames are to be displayed...
@ -1867,7 +1881,7 @@ This function may look weird, but this is faster than recursion."
(or (ebrowse-cs-file class)
"unknown")
")")
(ebrowse-set-face start (point) 'ebrowse-file-name-face))
(ebrowse-set-face start (point) 'ebrowse-file-name))
(ebrowse-set-mark-props start-of-line (1+ start-of-line) tree)
(add-text-properties
start-of-class-name end-of-class-name
@ -2694,7 +2708,7 @@ the class cursor is on."
(insert "<>"))
(setq class-name-end (point))
(insert ":\n\n")
(ebrowse-set-face start (point) 'ebrowse-member-class-face)
(ebrowse-set-face start (point) 'ebrowse-member-class)
(add-text-properties
class-name-start class-name-end
'(ebrowse-what class-name
@ -2810,7 +2824,7 @@ TREE is the class tree of MEMBER-LIST."
(ebrowse-draw-member-attributes member-struc)
(insert ">")
(ebrowse-set-face start (point)
'ebrowse-member-attribute-face)))
'ebrowse-member-attribute)))
(insert " ")
(ebrowse-draw-member-regexp member-struc))))
(insert "\n")
@ -2841,7 +2855,7 @@ TREE is the class tree in which the members are found."
(ebrowse-draw-member-attributes member)
(insert "> ")
(ebrowse-set-face start-of-entry (point)
'ebrowse-member-attribute-face))
'ebrowse-member-attribute))
;; insert member name truncated to column width
(setq start-of-name (point))
(insert (substring name 0

18
lisp/progmodes/flymake.el
View file

@ -704,7 +704,7 @@ It's flymake process filter."
(nth 1 err-info))
(defvar flymake-new-err-info nil
"Same as 'flymake-err-info', effective when a syntax check is in progress.")
"Same as `flymake-err-info', effective when a syntax check is in progress.")
(make-variable-buffer-local 'flymake-new-err-info)
@ -839,19 +839,23 @@ Return t if it has at least one flymake overlay, nil if no overlay."
(setq ov (cdr ov)))
has-flymake-overlays))
(defface flymake-errline-face
(defface flymake-errline
;;+ '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
;;+ '((((class color)) (:underline "OrangeRed"))
'((((class color)) (:background "LightPink"))
(t (:bold t)))
"Face used for marking error lines."
:group 'flymake)
;; backward-compatibility alias
(put 'flymake-errline-face 'face-alias 'flymake-errline)
(defface flymake-warnline-face
(defface flymake-warnline
'((((class color)) (:background "LightBlue2"))
(t (:bold t)))
"Face used for marking warning lines."
:group 'flymake)
;; backward-compatibility alias
(put 'flymake-warnline-face 'face-alias 'flymake-warnline)
(defun flymake-highlight-line (line-no line-err-info-list)
"Highlight line LINE-NO in current buffer.
@ -886,8 +890,8 @@ Perhaps use text from LINE-ERR-INFO-ILST to enhance highlighting."
(setq end (point)))
(if (> (flymake-get-line-err-count line-err-info-list "e") 0)
(setq face 'flymake-errline-face)
(setq face 'flymake-warnline-face))
(setq face 'flymake-errline)
(setq face 'flymake-warnline))
(flymake-make-overlay beg end tooltip-text face nil)))
@ -1312,7 +1316,7 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists, or just REL-FILE-NAME if
(flymake-start-syntax-check buffer)))))
(defun flymake-start-syntax-check-for-current-buffer ()
"Run 'flymake-start-syntax-check' for current buffer if it isn't already running."
"Run `flymake-start-syntax-check' for current buffer if it isn't already running."
(interactive)
(flymake-start-syntax-check (current-buffer)))
@ -1655,7 +1659,7 @@ With arg, turn Flymake mode on if and only if arg is positive."
temp-source-file-name))
(defun flymake-simple-cleanup (buffer)
"Do cleanup after 'flymake-init-create-temp-buffer-copy'.
"Do cleanup after `flymake-init-create-temp-buffer-copy'.
Delete temp file."
(let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name")))
(flymake-safe-delete-file temp-source-file-name)

58
lisp/progmodes/gdb-ui.el
View file

@ -250,7 +250,7 @@ Also display the main routine in the disassembly buffer if present."
(let ((string (buffer-string)))
;; remove newline for gud-tooltip-echo-area
(substring string 0 (- (length string) 1))))
gud-tooltip-echo-area))
(or gud-tooltip-echo-area tooltip-use-echo-area)))
;; If expr is a macro for a function don't print because of possible dangerous
;; side-effects. Also printing a function within a tooltip generates an
@ -994,24 +994,24 @@ sink to `user' in `gdb-stopping', that is fine."
This begins the collection of output from the current command if that
happens to be appropriate."
(unless gdb-pending-triggers
(gdb-get-selected-frame)
(gdb-invalidate-frames)
(gdb-invalidate-breakpoints)
;; Do this through gdb-get-selected-frame -> gdb-frame-handler
;; so gdb-frame-address is updated.
;; (gdb-invalidate-assembler)
(gdb-invalidate-registers)
(gdb-invalidate-memory)
(gdb-invalidate-locals)
(gdb-invalidate-threads)
(unless (eq system-type 'darwin) ;Breaks on Darwin's GDB-5.3.
;; FIXME: with GDB-6 on Darwin, this might very well work.
;; only needed/used with speedbar/watch expressions
(when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
(setq gdb-var-changed t) ; force update
(dolist (var gdb-var-list)
(setcar (nthcdr 5 var) nil))
(gdb-var-update))))
(gdb-get-selected-frame)
(gdb-invalidate-frames)
(gdb-invalidate-breakpoints)
;; Do this through gdb-get-selected-frame -> gdb-frame-handler
;; so gdb-frame-address is updated.
;; (gdb-invalidate-assembler)
(gdb-invalidate-registers)
(gdb-invalidate-memory)
(gdb-invalidate-locals)
(gdb-invalidate-threads)
(unless (eq system-type 'darwin) ;Breaks on Darwin's GDB-5.3.
;; FIXME: with GDB-6 on Darwin, this might very well work.
;; only needed/used with speedbar/watch expressions
(when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
(setq gdb-var-changed t) ; force update
(dolist (var gdb-var-list)
(setcar (nthcdr 5 var) nil))
(gdb-var-update))))
(let ((sink gdb-output-sink))
(cond
((eq sink 'user) t)
@ -1695,7 +1695,9 @@ static char *magick[] = {
(setq buffer-read-only t)
(use-local-map gdb-registers-mode-map)
(run-mode-hooks 'gdb-registers-mode-hook)
'gdb-invalidate-registers)
(if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
'gdb-invalidate-registers
'gdbmi-invalidate-registers))
(defun gdb-registers-buffer-name ()
(with-current-buffer gud-comint-buffer
@ -2172,18 +2174,18 @@ corresponding to the mode line clicked."
(let ((menu (make-sparse-keymap "GDB-UI")))
(define-key gud-menu-map [ui]
`(menu-item "GDB-UI" ,menu :visible (eq gud-minor-mode 'gdba)))
(define-key menu [gdb-restore-windows]
'(menu-item "Restore Window Layout" gdb-restore-windows
:help "Restore standard layout for debug session."))
(define-key menu [gdb-many-windows]
'(menu-item "Display Other Windows" gdb-many-windows
:help "Toggle display of locals, stack and breakpoint information"
:button (:toggle . gdb-many-windows)))
(define-key menu [gdb-use-inferior-io]
(menu-bar-make-toggle toggle-gdb-use-inferior-io-buffer
gdb-use-inferior-io-buffer
"Separate inferior IO" "Use separate IO %s"
"Toggle separate IO for inferior.")))
"Toggle separate IO for inferior."))
(define-key menu [gdb-many-windows]
'(menu-item "Display Other Windows" gdb-many-windows
:help "Toggle display of locals, stack and breakpoint information"
:button (:toggle . gdb-many-windows)))
(define-key menu [gdb-restore-windows]
'(menu-item "Restore Window Layout" gdb-restore-windows
:help "Restore standard layout for debug session.")))
(defadvice toggle-gdb-use-inferior-io-buffer (after gdb-kill-io-buffer activate)
(unless gdb-use-inferior-io-buffer

Some files were not shown because too many files have changed in this diff Show more