diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2007-01-01 17:38:32 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2007-01-01 17:38:32 +0000 |
| commit | 65e86587ab836aaa86b12ce30b219bcb4fcbaa06 (patch) | |
| tree | 7e13feee7387635f52df3613cf1bba4414781aab /lisp | |
| parent | 8c778e28bcf16b4baef6400a124ec2403941e940 (diff) | |
| parent | 1fc8c92b50100da709c94a0faa47deed5603634f (diff) | |
| download | emacs-65e86587ab836aaa86b12ce30b219bcb4fcbaa06.tar.gz emacs-65e86587ab836aaa86b12ce30b219bcb4fcbaa06.tar.bz2 emacs-65e86587ab836aaa86b12ce30b219bcb4fcbaa06.zip | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-536
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-537
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-538
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-539
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-540
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-541
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-542
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-543
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-544
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-545
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-546
Update from erc--emacs--22
* emacs@sv.gnu.org/emacs--devo--0--patch-547
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-548
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-549
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-550
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-551
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-552
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-553
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-554
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-555
erc-iswitchb: Temporarily enable iswitchb mode
* emacs@sv.gnu.org/emacs--devo--0--patch-556
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-557
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-558
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-559
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-560
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-561
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-562
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-563
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-564
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-565
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-566
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-567
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-568
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-569
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-570
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-571
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-572
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-573
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-574
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-575
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-576
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-577
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-578
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-579
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-580
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-581
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-582
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-583
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-584
Fix admin/quick-install-emacs to work with recent versions of autoconf
* emacs@sv.gnu.org/gnus--rel--5.10--patch-171
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-172
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-173
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-174
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-175
Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-176
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-177
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-178
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-179
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-180
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-181
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-182
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-183
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-184
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-185
Merge from emacs--devo--0
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-590
Diffstat (limited to 'lisp')
531 files changed, 4364 insertions, 3098 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94b535a1604..1cd2f794e5f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,17 +1,780 @@ +2006-12-31 Romain Francoise <romain@orebokech.com> + + * net/tramp.el (tramp-default-method): Don't use `symbol-function'. + +2006-12-31 Kim F. Storm <storm@cua.dk> + + * files.el (auto-mode-case-fold): New defcustom. + (set-auto-mode): If non-nil, perform second case-sensitive pass + through auto-mode-alist if first pass failed. + +2006-12-30 Richard Stallman <rms@gnu.org> + + * emacs-lisp/easy-mmode.el (define-global-minor-mode): Doc fix. + +2006-12-30 Ken Manheimer <ken.manheimer@gmail.com> + + * allout.el (allout-encrypt-string): Handle symmetric-key + passphrase caching but leave keypair caching to pgg. + +2006-12-30 Michael Albinus <michael.albinus@gmx.de> + + Sync with Tramp 2.0.55. + + * net/tramp.el (tramp-completion-mode): Use `wholenump' instead of + `integerp'. `char-equal' could fail else in case of negative + numbers. Reported by Toby Speight <T.M.Speight.90@cantab.net>. + (top): Check for `font-lock-add-keywords' before calling; it + doesn't exist under XEmacs. + (tramp-yn-prompt-regexp): Fix regexp. Add question from plink. + (tramp-completion-mode): Remove clause (not + tramp-unified-filenames), because the function is called in other + context too, where this check results in wrong results in the + XEmacs case on Windows. + (tramp-touch): UTC handling is not possible for XEmacs. + +2006-12-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * scroll-bar.el (previous-scroll-bar-mode): New variable + (set-scroll-bar-mode): Set previous-scroll-bar-mode. + (scroll-bar-mode): Use previous-scroll-bar-mode if set. + + * term/x-win.el: Set scroll bar mode to right if set by X resources. + +2006-12-30 Richard Stallman <rms@gnu.org> + + * files.el (make-backup-file-name-1): Precompute abs name + but don't lose the relative name. + + * international/mule-cmds.el (select-safe-coding-system-interactively): + Fix message. + +2006-12-30 Kevin Rodgers <kevin.d.rodgers@gmail.com> + + * files.el (backup-buffer): Show entire backup file name in msg. + +2006-12-30 Juanma Barranquero <lekktu@gmail.com> + + * image.el (image-type-header-regexps, image-type-from-data) + (image-type-from-buffer, image-type-from-file-header): + Revert changes from 2006-12-26. + (image-type-auto-detectable): New variable. + (image-type-auto-detected-p): New function. + + * files.el (magic-mode-alist): Detect image files with + `image-type-auto-detected-p' instead of `image-type-from-buffer'. + +2006-12-29 Nick Roberts <nickrob@snap.net.nz> + + * dired.el (dired-sort-other): Move test for dired-mode... + (dired-sort-set-modeline): ...to here. + +2006-12-29 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * textmodes/fill.el (fill-comment-paragraph): Document 2006-12-24 + change. Suggested by Stefan Monnier. + +2006-12-29 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/bindat.el (bindat--unpack-group, bindat--length-group) + (bindat--pack-group): Let-bind COUNT during repeat block evaluation. + +2006-12-27 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/authors.el (authors-aliases): Anchor FSF alias regexp, + so it doesn't accidentally match an fsf.org mail address. + (authors-renamed-files-alist): Add tcover-*.el. + +2006-12-27 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-arch.el (vc-arch-find-version): New function. + + * vc-hooks.el (vc-version-backup-file-name): Revision names may be + composed of arbitrary characters (even /) in some systems. + +2006-12-27 Eli Zaretskii <eliz@gnu.org> + + * international/mule-cmds.el (select-safe-coding-system-interactively): + Improve the message in the *Warning* buffer. + +2006-12-27 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-set-matches-1): Fix last change. If default item is + current buffer, it is ok to be first. + +2006-12-27 Kenichi Handa <handa@m17n.org> + + * international/mule-cmds.el (select-safe-coding-system-interactively): + Improve the message in *Warning* buffer. + +2006-12-27 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-set-matches-1): Never put current buffer first if + there are other matches. + +2006-12-26 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gud-watch): Allow duplicate names for watch + expressions. + (gdb-var-delete): Handle duplicate names. Print message for non + root expressions. + (gdb-partial-output-name): Start buffer name with a space. + (gdb-info-breakpoints-custom, gdb-reset): Handle space in above + buffer name. + +2006-12-26 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * mail/footnote.el (Footnote-insert-footnote): Fix the search of the + last footnote when `footnote-spaced-footnotes' is nil. + +2006-12-26 Richard Stallman <rms@gnu.org> + + * cus-edit.el (custom-browse-sort-alphabetically) + (custom-buffer-sort-alphabetically) + (custom-menu-sort-alphabetically): Doc fixes. Add autoloads. + + * image.el (image-type-header-regexps): Change element format + to include third item NOT-ALWAYS. + (image-type-from-data): Handle new format. + (image-type-from-buffer): Handle new format. New arg INCLUDE-MAYBES. + (image-type-from-file-header): Pass t for INCLUDE-MAYBES. + +2006-12-26 Guanpeng Xu <herberteuler@hotmail.com> (tiny change) + + * add-log.el (add-log-current-defun): Call `forward-sexp' + multiple times to pick a member function name defined as + part of nested classes/namespaces. + +2006-12-26 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * emacs-lisp/easymenu.el (easy-menu-change): New arg MAP to indicate + which keymap should be used to change menu. It does not affect any + existent code. + +2006-12-26 Richard Stallman <rms@gnu.org> + + * textmodes/fill.el (fill-paragraph): Check for a minibuffer + rather than for being in a minibuffer window. + +2006-12-25 Daiki Ueno <ueno@unixuser.org> + + * pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of + locale-coding-system. + * pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type + LF. + +2006-12-25 Michael R. Mauger <mmaug@yahoo.com> + + * progmodes/sql.el (sql-mode-abbrev-table): Corrected initialization. + (sql-mode-syntax-table): Disable double quoted strings. + (sql-mode-font-lock-object-name): Added TYPE and TYPE BODY. + +2006-12-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * startup.el (fancy-splash-last-input-event): New variable. + (fancy-splash-special-event-action): New function. + (fancy-splash-screens): Temporarily bind special events to it. + Execute command for saved special event before exiting from + recursive editing. + + * term/mac-win.el (mac-keyboard-translate-char, mac-unread-string): + New functions. + (mac-ts-update-active-input-area, mac-ts-unicode-for-key-event): + Use mac-unread-string. + +2006-12-24 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * textmodes/fill.el (fill-comment-paragraph): Prevent the use of + an optimized comment regexp if `comment-start-skip' uses a ^. + * bs.el (bs--up): Remove interactive spec. + +2006-12-24 Chong Yidong <cyd@stupidchicken.com> + + * woman.el (woman-decode-buffer): Signal error for alien macro sets. + Suggested by James Cloos. + +2006-12-24 Kevin Ryde <user42@zip.com.au> + + * calendar/cal-dst.el (calendar-dst-starts): Default to second Sunday + in March. + (calendar-dst-ends): Default to first Sunday in November. + +2006-12-24 Ken Manheimer <ken.manheimer@gmail.com> + + * allout.el (allout-encrypt-string): Inhibit use of agent within + body of let form where encryption happens. Acknowledge non-use of + gpg-agent in docstring. + (allout-toggle-subtree-encryption): Acknowledge non-use of + gpg-agent in docstring. + +2006-12-24 Chong Yidong <cyd@stupidchicken.com> + + * custom.el (custom-add-frequent-value): Alias for custom-add-option. + +2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-diff.el (ediff-diff-options): Clarify docstring. + (ediff-setup-diff-regions): Disallow -u in ediff-diff-options. + + * viper-cmd.el (viper-post-command-sentinel): Protect against errors + in hooks. + (viper-add-newline-at-eob-if-necessary): Add newline only if we + actually modify buffer; ignore errors if occur. + +2006-12-23 Chong Yidong <cyd@stupidchicken.com> + + * calendar/calendar.el (calendar-mode-map): Switch < and >. + (calendar-mode-line-format): Use mouse-1 bindings, and tweak + formatting. + +2006-12-23 Richard Stallman <rms@gnu.org> + + * simple.el (delete-horizontal-space): Doc fix. + +2006-12-23 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (bootstrap-clean): Run bootstrap-clean-$(SHELLTYPE) + explicitly in a recursive Make, not implicitly through prerequisites, + since the latter is wrong under parallel builds. + +2006-12-22 Eli Zaretskii <eliz@gnu.org> + + * w32-fns.el (convert-standard-filename): Wrap in save-match-data. + +2006-12-22 Kevin Rodgers <kevin.d.rodgers@gmail.com> (tiny change) + + * progmodes/sh-script.el (sh-make-vars-local): Fix a typo in + message string. + +2006-12-22 Ben North <ben@redfrontdoor.org> (tiny change) + + * outline.el (outline-next-visible-heading): Fix the case with a + header at end-of-file with no final newline. + +2006-12-22 Robert Thorpe <rthorpe@realworldtech.com> (tiny change) + + * indent.el (tab-always-indent): Doc fix. + +2006-12-22 Chong Yidong <cyd@stupidchicken.com> + + * info.el (Info-fontify-maximum-menu-size): Bump to 1000000. + (Info-fontify-node): Do fontify indices. + + * tutorial.el (tutorial--detailed-help): Remove unnecessary link + to the Emacs Lisp reference manual. + (tutorial--tab-map): Remove. All callers changed. + (tutorial--find-changed-keys): New elt QUIET, used to... + (tutorial--display-changes): ...ensure that warning messages are + only issued once per changed key. + (tutorial--remove-remarks): Delete unused code-path. + (lang-strings): Remove extraneous formatting. + (tutorial--save-tutorial): Prompt before saving tutorial state. + +2006-12-21 Chong Yidong <cyd@stupidchicken.com> + + * tutorial.el: Remove `cl' requirement. Clean up whitespace. + Replace '?\ ' by '?\s' throughout. + (tutorial-warning-face): Inherit font-lock-warning-face. Move to + `help' custom group. + (tutorial--key-description): New function. + (tutorial--display-changes): Remove redundant arg. Scan for all + key sequences to avoid false matches. Cleanup. + (tutorial--saved-dir): Save to a subdirectory in .emacs.d to + reduce homedir pollution. + (help-with-tutorial): Call tutorial--display-changes with no arg. + +2006-12-21 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-mode-map): Bind org-complete also to M-\t. + +2006-12-20 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-default-method): We still need to check for + `executable-find', because it is not bound under Emacs 20. + (tramp-handle-file-name-completion) + (tramp-completion-handle-file-name-completion): Handle optional + parameter PREDICATE. + (tramp-find-default-method): Add code for default values. + +2006-12-20 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gdb-stopped): After attaching to a process + make gud-go send "continue". + +2006-12-19 Juanma Barranquero <lekktu@gmail.com> + + * image.el (image-type-header-regexps): Be more specific detecting `pbm' + and `png' files. Use non-capturing parenthesis for `tiff' regexp. + +2006-12-19 Kim F. Storm <storm@cua.dk> + + * bindings.el: Bind sigusr1 and sigusr2 in special-event-map + instead of global-map. + + * files.el (magic-mode-alist): Allow matching file type by + calling a function at bob. Check for image types by calling + image-type-from-buffer. Suggested by Juanma Barranquero. + (set-auto-mode): Do it. + +2006-12-19 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-methods): Introduce new method `scpc'. + Remove "ControlMaster" option from the other `scp*' methods. + (tramp-default-method): Check for ssh-agent before setting to `scp'. + +2006-12-18 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-mode): Show context after isearch. + (org-show-siblings): New function. + (org-show-context): Use `org-show-siblings'. + +2006-12-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/syntax.el (syntax-ppss-flush-cache, syntax-ppss): + Use syntax-ppss-toplevel-pos. + +2006-12-18 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-current-line): Make sure that lines are + counted from beginning of buffer. + (org-table-copy-region, org-table-paste-rectangle): Make sure that + lines are counted from beginning of buffer. + +2006-12-17 Chong Yidong <cyd@stupidchicken.com> + + * info.el (Info-build-node-completions): Signal error if tag-table + marker is not found. + + * pgg-gpg.el (pgg-gpg-use-agent): Default to t. + +2006-12-17 Alan Mackenzie <acm@muc.de> + + * emacs-lisp/lisp.el (beginning-of-defun-raw): Optimise (for + speed) the case when open-paren-in-column-0-is-defun-start is nil. + Based on code by Martin Rudalics. + + * progmodes/cc-mode.el (c-basic-common-init): Don't set + open-paren-in-column-0-is-defun-start to nil any more. + +2006-12-17 Richard Stallman <rms@gnu.org> + + * simple.el (delete-horizontal-space): Use prefix arg. + + * help-fns.el (describe-variable): Improve blank separator lines. + + * files.el (magic-mode-alist): Mark as risky. + + * files.el (make-backup-file-name-1): + Expand backup-directory explicitly. + +2006-12-17 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-default-method): Before setting to "pscp", + check whether package password.el is loaded, or Pageant is running. + +2006-12-17 Ulf Jasper <ulf.jasper@web.de> + + * calendar/icalendar.el (icalendar-version): Increase to "0.14". + (icalendar--rris): First try Emacs, then XEmacs. + (icalendar--convert-ical-to-diary): Doc fix. + Insert newline at end of target file. + +2006-12-17 Kim F. Storm <storm@cua.dk> + + * outline.el (outline-isearch-open-invisible-function): New defvar. + (outline-flag-region): Use it if non-nil for isearch-open-invisible + overlay property instead of outline-isearch-open-invisible. + +2006-12-16 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-completion-help): Build ido-cur-list and ido-matches + if ido-directory-too-big is set on entry. + (ido-toggle-ignore, ido-completion-help): Print message while + reading big directory. + +2006-12-15 Richard Stallman <rms@gnu.org> + + * shell.el (shell): Doc fix. + +2006-12-15 Kevin Gallagher <Kevin.Gallagher@boeing.com> + + * emulation/edt.el (edt-xserver): + * emulation/edt-mapper.el (edt-xserver): Replace `/' with a `-', + to fix a problem on Cygwin. + + * emulation/edt.el + * emulation/edt-mapper.el + * emulation/edt-lk201.el + * emulation/edt-pc.el + * emulation/edt-vt100.el: Update maintainer's email address. + +2006-12-15 Simon Marshall <simon@gnu.org> + + * progmodes/cc-fonts.el (c-font-lock-declarations): Fix previous + change. + +2006-12-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * term/mac-win.el (mac-atsu-font-table): Remove defvar. + (mac-handle-font-selection): Use mac-atsu-font-face-attributes + instead of mac-atsu-font-table. + (fontset-default): Specify argument MAXIMUM in x-list-fonts calls. + +2006-12-14 Stephen Leake <stephen_leake@member.fsf.org> + + * align.el (align-match-tex-pattern): Fix a rare bug which + hanged Emacs. + +2006-12-14 Richard Stallman <rms@gnu.org> + + * startup.el (use-fancy-splash-screens-p): Use frame-height + instead of window-height. Pass frame to image-size. + +2006-12-13 Kenichi Handa <handa@m17n.org> + + * international/mule-cmds.el (set-locale-environment): + Set default-sendmail-coding-system too. + +2006-12-12 J.D. Smith <jdsmith@as.arizona.edu> + + * progmodes/idlw-help.el: Fix copyright notice. + +2006-12-12 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/syntax.el (syntax-ppss-toplevel-pos): New fun. + +2006-12-11 Juanma Barranquero <lekktu@gmail.com> + + * subr.el (unread-command-char): Reformat obsolescence info. + +2006-12-11 Richard Stallman <rms@gnu.org> + + * emacs-lisp/cl-macs.el (defstruct): Suppress warnings + about calls to cl-struct-setf-expander. + +2006-12-11 Juanma Barranquero <lekktu@gmail.com> + + * ediff-merg.el (ediff-show-clashes-only): Doc fix. + (ediff-combination-pattern): Fix typo in docstring. + + * textmodes/refer.el (refer-find-entry): Doc fix. + (refer-bib-files-regexp, refer-bib-directory, refer-bib-files) + (refer-cache-bib-files, refer-find-next-entry, refer-yank-key): + Fix tipos in docstrings. + + * progmodes/idlwave.el (idlwave-library-path): Fix typos in docstring. + +2006-12-10 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-init-completion-maps): Remap backward-kill-word + instead of binding M-backspace. + +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * replace.el (replace-match-data, replace-match-maybe-edit): + * calc/calc-aent.el (calc-eval-error): + * emulation/vi.el (vi-char-argument): + * progmodes/cc-langs.el (c-at-vsemi-p-fn) + (c-vsemi-status-unknown-p-fn): Doc fixes. + +2006-12-10 Chong Yidong <cyd@stupidchicken.com> + + * menu-bar.el (menu-bar-showhide-menu, menu-bar-tools-menu) + (menu-bar-help-menu): Tooltip fixes. Suggested by Francis Wright. + +2006-12-10 Masatake YAMATO <jet@gyve.org> + + * progmodes/ld-script.el (ld-script-keywords): Fix a typo. + +2006-12-09 Chong Yidong <cyd@stupidchicken.com> + + * mouse-sel.el (mouse-sel-mode): Register mouse-2 as a click type. + + * man.el (Man-xref-button-action): New function. If the + `Man-target-string' button property is a function, assume it + accepts a position argument. + (Man-abstract-xref-man-page): Use it. + (Man-default-man-entry): New optional arg POS. + + * wdired.el (wdired-preprocess-symlinks): Make the spaces after + symlink arrows read-only and non-rear-sticky. + +2006-12-09 Martin Rudalics <rudalics@gmx.at> + + * wdired.el (wdired-change-to-wdired-mode, wdired-finish-edit) + (wdired-search-and-rename): Simplify code. + (wdired-preprocess-files, wdired-preprocess-perms): Make + read-only property of preceding character rear-nonsticky to + avoid that it can be modified. Put old-name and old-link + properties on character preceding name and replace + put-text-property by add-text-properties. + (wdired-get-filename, wdired-get-previous-link): Get old-name + and old-link properties from character preceding name and + simplify code. + (wdired-preprocess-perms, wdired-set-bit, wdired-toggle-bit) + (wdired-perms-to-number): Make local-map property + rear-nonsticky to avoid that text following permissions may be + modified. Use add-text-properties instead of put-text-property + when changing a permission bit. + (wdired-change-to-dired-mode): Remove stickiness properties. + +2006-12-09 Juanma Barranquero <lekktu@gmail.com> + + * international/mule-cmds.el (register-input-method): Doc fix. + +2006-12-09 Masayuki Ataka <masayuki.ataka@gmail.com> (tiny change) + + * cmuscheme.el (scheme-start-file): Use `let*', not `let'. + +2006-12-09 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * textmodes/flyspell.el (flyspell-hack-local-variables-hook): New. + Force buffer local defs evaluation on local variables loading. + (flyspell-mode-on, flyspell-mode-off): Use it in + `hack-local-variables-hook'. + +2006-12-09 Eli Zaretskii <eliz@gnu.org> + + * emacs-lisp/find-func.el (find-variable): Doc fix. + + * help-fns.el (variable-at-point): Doc fix. + + * w32-fns.el (w32-append-code-lines): New function. + +2006-12-09 Romain Francoise <romain@orebokech.com> + + * comint.el (comint-insert-input): Delete obsolete comment. + +2006-12-08 Kevin Rodgers <ihs_4664@yahoo.com> + + * files.el (insert-file-1): Compare file size to + large-file-warning-threshold and request confirmation when + warranted. + +2006-12-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * net/browse-url.el (browse-url): Set DISPLAY to the one of the + current frame, in case we're connected to several displays. + +2006-12-08 Juanma Barranquero <lekktu@gmail.com> + + * frame.el (other-frame): Doc fix. + (set-frame-parameter): Fix typo in docstring. + +2006-12-07 Kim F. Storm <storm@cua.dk> + + * info.el (Info-index): Strip leading colon from topic. + +2006-12-07 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-speedbar-buttons): Deal with references + to pointers. + +2006-12-05 J.D. Smith <jdsmith@as.arizona.edu> + + * progmodes/idlwave.el (idlwave-xml-create-class-method-lists): + Trim out spurious class inheritance "None" entries. + +2006-12-05 Kim F. Storm <storm@cua.dk> + + * emulation/cua-base.el (cua-paste-pop-rotate-temporarily): Doc fix. + (cua-paste-pop): Rework last change for + cua-paste-pop-rotate-temporarily, so first M-y and C-y works alike, + pasting the head of the kill-ring, and prefix arg C-u M-y inserts the + text inserted by the last M-y command. + +2006-12-05 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * cmuscheme.el (run-scheme, scheme-start-file): Search the start + file in ~/.emacs.d as `init_SCHEMENAME.scm' instead. + + * shell.el (shell): Search the start file in ~/.emacs.d as + `init_SHELLNAME.sh' instead. + +2006-12-05 Glenn Morris <rgm@gnu.org> + + * progmodes/cperl-mode.el (cperl-mode) + * progmodes/f90.el (f90-mode-abbrev-table) + * progmodes/fortran.el (fortran-mode-abbrev-table) + * progmodes/octave-mod.el (octave-abbrev-table) + * progmodes/sql.el (sql-mode-abbrev-table): Define abbrevs even + if abbrev-table is non-nil (saved user abbrevs may have been restored). + + * progmodes/vhdl-mode.el (vhdl-mode-abbrev-table-init): Do not + clear abbrev table, else saved abbrevs will not be restored. + +2006-12-04 Juanma Barranquero <lekktu@gmail.com> + + * facemenu.el (facemenu-unlisted-faces): Put obsolescence info in + the call to `make-obsolete-variable', not in the docstring. + +2006-12-04 Chong Yidong <cyd@stupidchicken.com> + + * facemenu.el (facemenu-unlisted-faces): Define as obsolete variable. + +2006-12-04 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * progmodes/ebnf-abn.el: + * progmodes/ebnf-bnf.el: + * progmodes/ebnf-dtd.el: + * progmodes/ebnf-ebx.el: + * progmodes/ebnf-iso.el: + * progmodes/ebnf-otz.el: + * progmodes/ebnf-yac.el: + * progmodes/ebnf2ps.el: + * delim-col.el: + * printing.el: + * ps-bdf.el: + * ps-mule.el: + * ps-print.el: Remove 'Time-stamp' comment mark. + + * printing.el (pr-menu-bind): Replace 'easy-menu-change' by + 'easy-menu-add-item' when called in Emacs 21 or higher. + +2006-12-04 Stephen Leake <stephen_leake@stephe-leake.org> + + * progmodes/ada-xref.el (ada-check-current): Doc fix. + (ada-make-body-gnatstub): Doc fix. Remove redundant `progn'. + +2006-12-04 Kim F. Storm <storm@cua.dk> + + * bindings.el (global-map): Bind [signal t] to ignore, to have + user signals ignored by default. + +2006-12-04 Juanma Barranquero <lekktu@gmail.com> + + * descr-text.el (describe-char-unicode-data): Use a hidden buffer for + Unicode data file pointed to by `describe-char-unicodedata-file'. + +2006-12-04 Stefan Monnier <monnier@iro.umontreal.ca> + + * textmodes/sgml-mode.el (sgml-font-lock-keywords-1): Fix pathological + O(n^2) regexp-search by anchoring the search. + +2006-12-04 Dan Nicolaescu <dann@ics.uci.edu> + + * whitespace.el (whitespace-cleanup-internal): Use current + argument for recursive call. + +2006-12-04 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-methods): Add "ControlPath" and + "ControlMaster" to scp, scp1 and scp2 methods. Suggested by + Andreas Schwab <schwab@suse.de>. + (tramp-do-copy-or-rename-file-out-of-band) + (tramp-open-connection-rsh): Compute format spec for ?t. + (tramp-process-actions): Trace command parameters. + +2006-12-04 Nick Roberts <nickrob@snap.net.nz> + + * simple.el (toggle-truncate-lines): Clarify doc string. + + * progmodes/gdb-ui.el (gdb-var-delete-children): New function. + (gdb-speedbar-expand-node): Use it. + +2006-12-04 Richard Stallman <rms@gnu.org> + + * progmodes/python.el (python-indent): Add safe-local-variable prop. + + * dired.el (dired-revert): Turn off dired-after-readin-hook + around call to dired-readin. + + * menu-bar.el (menu-bar-make-toggle): Add "globally" + to echo area messages. + <indicate-empty-lines, case-fold-search>: + Add "globally" to Help string. + <case-fold-search>: MESSAGE arg need not say "globally". + (menu-bar-edit-menu <paste-from-menu>): Rename from select-and-paste. + +2006-12-03 Liam Healy <lnp@healy.washington.dc.us> (tiny change) + + * outline.el (outline-end-of-subtree): Don't leave an empty + line hidden as we would a real next heading. + +2006-12-03 Ken Manheimer <ken.manheimer@gmail.com> + + * allout.el (allout-ascend): Add an optional argument to preserve + original position of point when unsuccessful. Also, fix a + docstring error. + (allout-yank-processing): Fix depth shift of multiple-topic so yanks + work again, using allout-ascend's new option. + (allout-setup-mode-map): Extract from allout-mode to initialize + allout-mode-map. Call it on file load, so the mode docstring + substitutions work even if allout mode has not yet been invoked. + (allout-mode): Use new allout-setup-mode-map to track any keybinding + customizations since the map was last processed. Also, refine the + docstring so it's ship-shape for release. + (allout-default-layout, allout-beginning-of-line-cycles) + (allout-distinctive-bullets-string, allout-use-mode-specific-leader) + (allout-encrypt-unencrypted-on-saves, allout-inhibit-auto-fill) + (allout-version, allout-layout, allout-infer-body-reindent) + (allout-infer-header-lead-and-primary-bullet, allout-view-change-hook) + (allout-init, allout-mode, allout-next-heading, allout-chart-subtree) + (allout-previous-heading, allout-goto-prefix-doublechecked) + (allout-current-bullet-pos, allout-next-sibling-leap) + (allout-pre-command-business, allout-encrypted-type-prefix) + (allout-make-topic-prefix, allout-open-topic, allout-rebullet-heading) + (allout-rebullet-topic, allout-rebullet-topic-grunt) + (allout-flag-region, allout-expose-topic, allout-expose-topic) + (allout-old-expose-topic, allout-listify-exposed) + (allout-process-exposed, allout-latex-verb-quote) + (allout-latex-verbatim-quote-curr-line, allout-adjust-file-variable) + (allout-toggle-current-subtree-encryption) + (allout-toggle-subtree-encryption, allout-bullet-isearch): + Remove extraneous open-paren and close paren string escapes. + +2006-12-03 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/ada-xref.el (is-windows, ada-find-in-src-path): Doc fixes. + (ada-xref-pos-ring-max, ada-xref-project-files, ada-xref-initialize) + (ada-prj-default-comp-cmd, ada-quote-cmd, ada-compile-current): + Fix typos in docstrings. + +2006-12-03 Glenn Morris <rgm@gnu.org> + + * progmodes/cc-align.el + * progmodes/cc-awk.el + * progmodes/cc-cmds.el + * progmodes/cc-compat.el + * progmodes/cc-defs.el + * progmodes/cc-engine.el + * progmodes/cc-langs.el + * progmodes/cc-menus.el + * progmodes/cc-mode.el + * progmodes/cc-styles.el + * progmodes/cc-vars.el + * progmodes/vhdl-mode.el: Fix Copyright format. + +2006-12-02 Chong Yidong <cyd@stupidchicken.com> + + * mouse.el (mouse-drag-track): Suppress automatic hscrolling for + initial down event. + +2006-12-02 Kim F. Storm <storm@cua.dk> + + * emulation/cua-base.el (cua-toggle-set-mark): Doc fix. + (cua-repeat-replace-region): Make M-v more robust. + (cua-paste-pop-rotate-temporarily): New defcustom. + (cua-paste-pop): Use it. + (cua-auto-mark-last-change): New defcustom. + (cua-pop-to-last-change): New helper function. + (cua-set-mark): Use them. + 2006-12-01 Nick Roberts <nickrob@snap.net.nz> - * menu-bar.el (toggle-case-fold-search): Clarfify doc/help string and + * menu-bar.el (toggle-case-fold-search): Clarify doc/help string and mini-buffer message. 2006-12-01 Juanma Barranquero <lekktu@gmail.com> * descr-text.el (describe-char-unicodedata-file): Fix typo in docstring. -2006-12-01 Vinicius Jose Latorre <viniciusjl@ig.com.br> +2006-12-01 Ben North <ben@redfrontdoor.org> * paren.el: Fix the highlight overlay extension when the user types a - sequence of char very fast just after the open parenthesis. - Suggested by Ben North <ben@redfrontdoor.org>. + sequence of char very fast just before the open parenthesis. + +2006-12-01 Vinicius Jose Latorre <viniciusjl@ig.com.br> * ps-mule.el: Eliminate Emacs 20 compatibility. @@ -81,8 +844,8 @@ 2006-11-29 J.D. Smith <jdsmith@as.arizona.edu> - * progmodes/idlwave.el (idlwave-auto-fill): Remove - paragraph-start let to prevent auto-fill giving up. + * progmodes/idlwave.el (idlwave-auto-fill): + Remove paragraph-start let to prevent auto-fill giving up. 2006-11-28 Juanma Barranquero <lekktu@gmail.com> @@ -90,8 +853,8 @@ 2006-11-27 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> - * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): Fix - interactive spec of the functions getting defined to make them + * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): + Fix interactive spec of the functions getting defined to make them work as documented. 2006-11-28 Chong Yidong <cyd@stupidchicken.com> @@ -2337,7 +3100,7 @@ * add-log.el (add-log-current-defun): Use `forward-sexp' instead of `forward-word' to pick c++::symbol. - Reported by Herbert Euler <herberteuler@hotmail.com>. + Reported by Guanpeng Xu <herberteuler@hotmail.com>. 2006-09-22 Kenichi Handa <handa@m17n.org> @@ -2966,7 +3729,7 @@ 2006-09-08 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> - * term/mac-win.el: (show-hide-font-panel): New HI command ID symbol. + * term/mac-win.el (show-hide-font-panel): New HI command ID symbol. (mac-apple-event-map): Define its handler. 2006-09-07 Toby Allsopp <Toby.Allsopp@navman.com> (tiny change) @@ -4178,7 +4941,7 @@ 2006-07-20 Jay Belanger <belanger@truman.edu> - * calc.el (calc-previous-alg-entry): Remove variable. + * calc.el (calc-previous-alg-entry): Remove variable. * calc-aent.el (calc-alg-entry-history, calc-quick-calc-history): New variables. @@ -5716,8 +6479,8 @@ load-path. Put a regexp matching the file name into after-load-alist, rather than the name itself. - * subr.el: New functions load-history-regexp, - load-history-filename-element, do-after-load-evaluation. + * subr.el (load-history-regexp, load-history-filename-element) + (do-after-load-evaluation): New functions. * international/mule.el (load-with-code-conversion): Do the eval-after-load stuff by calling do-after-load-evaluation. diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index 4dd226b42a3..7dc41a63526 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -3246,7 +3246,8 @@ Set current buffer variables from defaults in case user's init file has changed them. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 912dfd2761b..b626a61c8d3 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -68,9 +68,9 @@ superseding the old separate derived mode in awk-mode.el. * progmodes/cc-vars.el, cc-mode-19.el, progmodes/cc-langs.el, - progmodes/cc-mode.el, progmodes/cc-defs.el, - progmodes/cc-engine.el, progmodes/cc-fonts.el: Changes for the - new AWK support. + * progmodes/cc-mode.el, progmodes/cc-defs.el, + * progmodes/cc-engine.el, progmodes/cc-fonts.el: + Changes for the new AWK support. 2003-07-03 Martin Stjernholm <bug-cc-mode@gnu.org> @@ -101,7 +101,7 @@ emacsen that doesn't have it. * progmodes/cc-styles.el, progmodes/cc-vars.el, - progmodes/cc-cmds.el: Fixes for the syntactic symbols for + * progmodes/cc-cmds.el: Fixes for the syntactic symbols for module and composition blocks. * progmodes/cc-mode.el (c-basic-common-init): @@ -122,8 +122,8 @@ macros in C99. * progmodes/cc-menus.el, progmodes/cc-langs.el, - progmodes/cc-engine.el, progmodes/cc-fonts.el, - progmodes/cc-cmds.el: Fixed various regexps to use POSIX char + * progmodes/cc-engine.el, progmodes/cc-fonts.el, + * progmodes/cc-cmds.el: Fixed various regexps to use POSIX char classes when that is supported. * progmodes/cc-defs.el (c-alpha, c-alnum, c-digit, c-upper, c-lower): @@ -170,7 +170,6 @@ * progmodes/cc-engine.el: Fixes in face handling to cope with doc comments. - (c-find-decl-spots): More failsafe skipping of comments and strings that only have been partially fontified. @@ -294,7 +293,7 @@ properties completely. * progmodes/cc-fonts.el (c-cpp-matchers): Handle line - continuations in cpp expressions. Do not fontify symbols after + continuations in cpp expressions. Do not fontify symbols after #ifdef etc as variables since that isn't consistent with how the face is used elsewhere (i.e. only for the definition of the symbol). @@ -492,9 +491,8 @@ directives are now considered part of the keywords to make things easier. - * progmodes/cc-defs.el: (c-(up|down)-list-(forward|backward)): + * progmodes/cc-defs.el (c-(up|down)-list-(forward|backward)): Make the position optional and added docstrings. - (c-go-(up|down)-list-(forward|backward)): Add variants of the above that move point and return successfulness instead. @@ -668,10 +666,9 @@ each (X)Emacs flavor. * progmodes/cc-vars.el, progmodes/cc-defs.el, - progmodes/cc-engine.el, progmodes/cc-mode.el: + * progmodes/cc-engine.el, progmodes/cc-mode.el: Use `lookup-syntax-properties' in XEmacs to control whether the syntax-table property has any effect or not. - (c-parse-sexp-lookup-properties): New macro that expands to either `parse-sexp-lookup-properties' or `lookup-syntax-properties'. @@ -742,7 +739,7 @@ (c-simple-skip-symbol-backward, c-syntactic-content) (c-remove-<>-paren-properties): New helper functions. - * progmodes/cc-defs.el: (c-clear-char-syntax) + * progmodes/cc-defs.el (c-clear-char-syntax) (c-mark-paren-open, c-mark-paren-close): New support functions to handle syntactic properties on C++ template arglist brackets. (c-put-type-face, c-put-reference-face): Helpers to put faces on @@ -750,12 +747,12 @@ in progmodes/cc-engine.el. * progmodes/cc-engine.el, progmodes/cc-fonts.el, - progmodes/cc-langs.el: Fix the names on a number of regexp + * progmodes/cc-langs.el: Fix the names on a number of regexp language variables to conform to the nomenclature and shortened some names. * progmodes/cc-align.el, progmodes/cc-cmds.el, - progmodes/cc-fonts.el, progmodes/cc-engine.el + * progmodes/cc-fonts.el, progmodes/cc-engine.el (c-syntactic-re-search-forward): Remove the COUNT argument since it's never used. Add an argument to tell which subexpression whose end should be tested for syntactic @@ -803,7 +800,6 @@ This fixes a performance problem that could occur when `fill-paragraph' is used in font lock mode on a comment at the end of a large class or function. - (c-state-cache-start): Fix buffer localness. * progmodes/cc-langs.el: Updates from the C99 standard (or @@ -842,7 +838,6 @@ table for types: If a name is recognized as a type in a declaration it's added in an obarray to be able to recognize it in other ambiguous declarations. - (c-remove-ws): New helper function to canonicalize fully qualified identifiers for `c-found-types'. @@ -851,14 +846,12 @@ * progmodes/cc-align.el (c-lineup-arglist-close-under-paren): Work correctly with nested arglist-cont-nonempty symbols. - (c-lineup-arglist-operators): New lineup function to line up infix operators under the open paren of the surrounding sexp. * progmodes/cc-engine.el (c-forward-syntactic-ws): Fix a bug that could cause an infinite loop if something that looks like a macro begins in the middle of a line. - (c-parse-state): Fix a bug that could cause `c-state-cache' to contain two conses in sequence when there's an unbalanced open paren in a macro. @@ -874,13 +867,11 @@ string, or a macro. * progmodes/cc-align.el, progmodes/cc-cmds.el, - progmodes/cc-engine.el (c-forward-single-comment, - c-forward-comments, c-backward-single-comment, - c-backward-comments): New replacements for `c-forward-comment' - that wraps `forward-comment' more efficiently in each of the - four different cases it's actually used. These replacements - also treats line continuations as whitespace. - + * progmodes/cc-engine.el (c-forward-single-comment) + (c-forward-comments, c-backward-single-comment, c-backward-comments): + New replacements for `c-forward-comment' that wraps `forward-comment' + more efficiently in each of the four different cases it's actually + used. These replacements also treats line continuations as whitespace. (c-forward-comment): Remove. The four different cases above are basically different, so it's better to make them into separate functions than choose between them at runtime using @@ -936,7 +927,7 @@ matter. * progmodes/cc-align.el, progmodes/cc-defs.el, - progmodes/cc-engine.el, progmodes/cc-vars.el + * progmodes/cc-engine.el, progmodes/cc-vars.el (c-guess-basic-syntax, c-calc-offset) (c-get-syntactic-indentation, c-syntactic-context): Extend the representation of the syntactic context: Previously it was @@ -990,16 +981,13 @@ position for defun-open in K&R style functions. * progmodes/cc-engine.el (c-in-knr-argdecl): Don't trip up on macros. - (c-search-decl-header-end): Handle C++ template arguments more correctly. - (c-beginning-of-decl-1): Fix when the declaration is first in a macro. * progmodes/cc-engine.el (c-beginning-of-decl-1): Better way to handle protection labels, one which doesn't get confused by inherit colons. - (c-end-of-decl-1): Don't treat functions that have "class" or "struct" in the return type as classes or structs. @@ -1074,7 +1062,7 @@ (iswitchb-xemacs): Delete variable and use (featurep 'xemacs) and fboundp instead. (iswitchb-completions): Remove two redundant arguments and local - variables. (All above from Stefan Monnier). + variables. (All above from Stefan Monnier). 2003-06-20 Masatake YAMATO <jet@gyve.org> @@ -1182,7 +1170,7 @@ (gud-find-c-expr): Simplify. * progmodes/fortran.el (fortran-gud-syntax-table): Syntax table - for parsing Fortran expressions for gud-print. (Stefan Monnier) + for parsing Fortran expressions for gud-print. (Stefan Monnier) (fortran-mode): Add local variable gud-find-expr. * progmodes/cc-mode.el (c-mode): Add local variable gud-find-expr. @@ -1230,7 +1218,7 @@ (tramp-file-name-handler): Do not invoke the old remote-shell handler. (tramp-find-foreign-file-name-handler): Return after first match is found. From Francis Litterio <franl@world.std.com>. - (tramp-handle-file-newer-than-file-p): `tramp-time-diff' returns + (tramp-handle-file-newer-than-file-p): `tramp-time-diff' returns integer, not list. Do not apply `car' to the return value of `tramp-time-diff'. Reported by David D. Smith <ultrasoul@ultrasoul.com>. @@ -1285,7 +1273,7 @@ * emacs-lisp/debug.el (debug): Fix call to message. -2003-06-16 Michael Mauger <mmaug@yahoo.com> (tiny change) +2003-06-16 Michael Mauger <mmaug@yahoo.com> (tiny change) * emulation/cua-base.el (cua-mode): Use explicit arg to turn off minor modes. @@ -1460,7 +1448,7 @@ * info.el (Info-fontify-node): Don't refill over lines ending in a period; this should fix problems with lists like one in the - (emacs)Library Keywords section. + "(emacs)Library Keywords" section. 2003-06-05 Markus Rost <rost@math.ohio-state.edu> @@ -1652,7 +1640,7 @@ * textmodes/bibtex.el: Long overdue merge. Don't require `compile' since it seems unnecessary. For all internal variables and functions the docstring comments have - been converted into proper docstrings + been converted into proper docstrings. (bibtex-maintainer-address, bibtex-maintainer-salutation) (bibtex-version): Remove support for bug reporting. (bibtex-field-delimiters, bibtex-entry-delimiters) @@ -2012,7 +2000,7 @@ * international/mule.el (ctext-non-standard-encodings-alist): Rename from non-standard-icccm-encodings-alist. - (ctext-non-standard-encodings-regexp): New variable + (ctext-non-standard-encodings-regexp): New variable. (ctext-post-read-conversion): Full rewrite. (ctext-non-standard-designations-alist): Rename from non-standard-designations-alist. @@ -2182,8 +2170,8 @@ (gdb-display-source-buffer): Display assembler during execution, when requested. (gud-menu-map): Add a toggle button to menubar for gdb-many-windows. - (gdb-many-windows): Define explicitly as a function and a variable - (formerly as a minor mode). These need to be global so layout can + (gdb-many-windows): Define explicitly as a function and a variable. + (formerly as a minor mode). These need to be global so layout can be reset from any buffer. (gdb-assembler-mode): Keep fringe outside margin as the overlay arrow is not used for assembler. @@ -2257,7 +2245,7 @@ * net/tramp-efs.el: New file. -2003-05-24 Michael Albinus <Michael.Albinus@alcatel.de> +2003-05-24 Michael Albinus <Michael.Albinus@alcatel.de> * net/tramp.el (tramp-handle-file-truename): `sym' shouldn't be quoted. @@ -2302,7 +2290,7 @@ (forms--mode-commands): Don't bind \t in the maps where we call forms--mode-commands1. -2003-05-23 Taro Kawagishi <tarok@acm.org> +2003-05-23 Taro Kawagishi <tarok@acm.org> * arc-mode.el (archive-lzh-summarize): Calculate correct total header size for LZH level 1 header. @@ -2396,7 +2384,7 @@ choices buffer. (ispell-show-choices): Directly select `choices-window'. (ispell-help): Use default buffer size for electric help. - (ispell-adjusted-window-height): Correct for xemacs detection. + (ispell-adjusted-window-height): Correct for XEmacs detection. (ispell-start-process): Don't double specify dictionary file name. (ispell-init-process): Set `ispell-library-path' each call. (ispell-change-dictionary): Now only completes valid dictionaries. @@ -2674,7 +2662,7 @@ (gdb-invalidate-breakpoints-and-assembler): Remove. (gdb-current-address): Remove. (gdb-previous-address): New variable. - (gud-until): Extend to work in Assembler buffer + (gud-until): Extend to work in Assembler buffer. (gdb-append-to-inferior-io): Select IO buffer when there is output. (gdb-assembler-custom): Try to get line marker (arrow) to display in window. Correct parsing for OS dependent output syntax of Gdb @@ -3343,7 +3331,7 @@ (ada-prj-find-prj-file): New parameter FILE. (ada-parse-prj-file): Take into account the ADA_INCLUDE_PATH and ADA_OBJECTS_PATH environment variables. Minor reorganization of the - code + code. (ada-get-all-references): Add support for GNAT 3.16 cross-references. * progmodes/ada-prj.el (ada-prj-add-keymap): Move to ada-mode.el @@ -3448,7 +3436,7 @@ (recentf-sort-directories-ascending) (recentf-sort-directories-descending) (recentf-show-basenames-ascending) - (recentf-show-basenames-descending: In-line. Better code. Doc fix. + (recentf-show-basenames-descending): In-line. Better code. Doc fix. (recentf-show-basenames) (recentf-relative-filter): Better code. Doc fix. (recentf-arrange-by-rule-subfilter): Doc fix. Improve :set code. @@ -3768,7 +3756,7 @@ * font-core.el (font-lock-maximum-size, font-lock-verbose): Remove. (font-lock-multiline, font-lock-fontified, font-lock-set-defaults): - Move back to font-lock.el + Move back to font-lock.el. (font-lock-default-function): Use font-lock-mode-internal. * files.el (auto-mode-alist): Add entries for *.ins and *.dtx. @@ -3831,7 +3819,7 @@ 2003-04-13 Masatake YAMATO <jet@gyve.org> * bindings.el (toplevel): Don't change the face - of major-mode on the mode line. Setting the face on + of major-mode on the mode line. Setting the face on the mode line code is installed by my mistake in my last change. @@ -3876,7 +3864,7 @@ (describe-minor-mode-from-symbol): Renamed from (old) describe-minor-mode. Use describe-minor-mode-completion-table-for-symbol. - Don't use eval. Just use symbol-name. + Don't use eval. Just use symbol-name. (describe-minor-mode-from-indicator): Document is updated. Use `format-mode-line'. Use describe-minor-mode-from-symbol instead of describe-minor-mode. @@ -3933,9 +3921,9 @@ 2003-04-11 Masatake YAMATO <jet@gyve.org> * progmodes/etags.el (select-tags-table-mode-map): - Don't create new keymap. Instead copy from button-buffer-map. + Don't create new keymap. Instead copy from button-buffer-map. Bind push-button to `t' instead of binding - select-tags-table-select directly + select-tags-table-select directly. (tags-select-tags-table): New button. (select-tags-table): Put a button for each selections. @@ -4070,14 +4058,14 @@ * international/utf-16.el (utf-16-le-decode-loop) (utf-16-be-decode-loop): New temporary variables. (ccl-decode-mule-utf-16-le): Use utf-16-le-decode-loop. - (ccl-decode-mule-utf-16-be): Use utf-16-be-decode-loop + (ccl-decode-mule-utf-16-be): Use utf-16-be-decode-loop. (ccl-decode-mule-utf-16-le-with-signature) (ccl-decode-mule-utf-16-be-with-signature) (ccl-decode-mule-utf-16): New CCL programs. (utf-16-le-encode-loop, utf-16-be-encode-loop): New temporary variables. (ccl-encode-mule-utf-16-le): Use utf-16-le-encode-loop. - (ccl-encode-mule-utf-16-be): Use utf-16-be-encode-loop + (ccl-encode-mule-utf-16-be): Use utf-16-be-encode-loop. (ccl-encode-mule-utf-16-le-with-signature) (ccl-encode-mule-utf-16-be-with-signature): New CCL programs. (mule-utf-16-post-read-conversion): New function. @@ -4124,7 +4112,7 @@ the same order as that in the buffer list, (desktop-save): Put buffers in the order given in desktop file, regardless of what handlers do. - (desktop-file-version): New variable. Version number of desktop + (desktop-file-version): New variable. Version number of desktop file format. (desktop-create-buffer-form): Variable deleted. (desktop-save): New customizable variable. @@ -4134,14 +4122,14 @@ (desktop-file-name): New function to convert a filename to the format specified in `desktop-file-name-format'. (desktop-create-buffer): Parameters renamed to descriptive - systematic names. These parameters are visible to handlers. + systematic names. These parameters are visible to handlers. Renames: ver -> desktop-file-version mim -> desktop-buffer-minor-modes pt -> desktop-buffer-point mk -> desktop-buffer-mark ro -> desktop-buffer-read-only - locals -> desktop-buffer-locals + locals -> desktop-buffer-locals. (desktop-buffer-major-mode, desktop-buffer-file-name) (desktop-buffer-name): Delete unused customizable variables. (desktop-buffer-misc): Delete unused variable. @@ -4157,7 +4145,7 @@ (desktop-change-dir): New function. (desktop-save-in-load-dir): New function. Save desktop in directory from which it was loaded. - (desktop-revert): New function. Revert to the last loaded desktop. + (desktop-revert): New function. Revert to the last loaded desktop. 2003-04-06 Masatake YAMATO <jet@gyve.org> @@ -5354,8 +5342,8 @@ of buffer. This enables recognition of end of HERE-doc "as one types". Require "\n" after trailing tag of HERE-doc. \( made non-quoting outside of string/comment (gdj-contributed). - Likewise for \$. Remove `here-doc-group' text property at start - (makes this property reliable). + Likewise for \$. Remove `here-doc-group' text property at + start (makes this property reliable). Text property `first-format-line' ==> t. Do not recognize $opt_s and $opt::s as s///. (cperl-after-block-p): Optional arg pre-block to check for a pre-block @@ -5624,7 +5612,7 @@ Face markup of calendar and diary displays: Any entry line that ends with [foo:value] where foo is a face attribute (except :box :stipple) or with [face:blah] tags, will have these values applied - to the calendar and fancy diary displays. These attributes "stack" + to the calendar and fancy diary displays. These attributes "stack" on calendar displays. File-wide attributes can be defined as follows: the first line matching "^# [tag:value]" defines the value for that particular tag. All of the tags' regexps can be @@ -5919,7 +5907,7 @@ I did it accidently. Infinite loop ... (tramp-get-device): `tramp-make-tramp-file-name' must not be called with NIL path. It fails in case of multi-method. - (tramp-file-name-for-operation): Apply `expand-file-name' for + (tramp-file-name-for-operation): Apply `expand-file-name' for relative file names only. Otherwise there might be problems if the default directory is another Tramp directory as the directory the file is based on. @@ -5968,7 +5956,7 @@ * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Apply `tramp-handle-directory-file-name'. - (tramp-smb-handle-file-attributes): Apply `tramp-get-device'. + (tramp-smb-handle-file-attributes): Apply `tramp-get-device'. ATIME and CTIME are (0 0) now (= "don't know"), which is more honest. (tramp-smb-handle-make-directory): Use Emacs file name primitives instead of calling tramp-smb-handle-* equivalents directly. @@ -6072,7 +6060,7 @@ regexp subpattern 5) (time-stamp-pattern): Initialize to nil to avoid regexp work in default case. - (time-stamp-string): Call set-time-zone-rule instead of setenv + (time-stamp-string): Call set-time-zone-rule instead of setenv. (time-stamp-hhmmss): Remove (not needed after all). (time-stamp-month-dd-yyyy, time-stamp-dd/mm/yyyy) (time-stamp-mon-dd-yyyy, time-stamp-dd-mon-yy, time-stamp-yy/mm/dd) @@ -6260,7 +6248,7 @@ of unrecognized entries indicating syntax errors in ChangeLog files. (authors-coding-system): New variable. (authors-many-files): Update doc string. - (authors-aliases): Change format. Now one entry with multiple + (authors-aliases): Change format. Now one entry with multiple aliases per author. (authors-valid-file-names, authors-renamed-files-alist) (authors-renamed-files-regexps): New variables. @@ -6363,7 +6351,7 @@ 2003-01-25 Bill Wohler <wohler@newt.com> - * mh-e: Created directory. ChangeLog will appear in a week when we + * mh-e: Created directory. ChangeLog will appear in a week when we release version 7.2. * mail/mh-alias.el, mail/mh-comp.el, mail/mh-customize.el, mail/mh-e.el, @@ -6532,7 +6520,7 @@ * gud.el (gud-display-line): If the current file is newer than its buffer, offer to reread the file. - (gud-keep-buffer): New buffer local variable. Ensures offer to + (gud-keep-buffer): New buffer local variable. Ensures offer to reread file is made just once. 2003-01-20 Stefan Monnier <monnier@cs.yale.edu> @@ -6735,10 +6723,10 @@ 2003-01-13 Markus Rost <rost@math.ohio-state.edu> - * cus-dep.el (custom-make-dependencies): Don't set standard-value + * cus-dep.el (custom-make-dependencies): Don't set standard-value and version numbers for variables. Handle faces. - * cus-edit.el (customize-changed-options): Doc addition. Load the + * cus-edit.el (customize-changed-options): Doc addition. Load the version deps earlier. Use other tests for groups and variables. Handle faces. @@ -6862,7 +6850,7 @@ 2003-01-11 Nick Roberts <nick@nick.uklinux.net> * gud.el (gud-kill-buffer-hook): Save gud-minor-mode type. - (gud-reset): New function. Reset environment at end of debugging. + (gud-reset): New function. Reset environment at end of debugging. (gud-sentinel): Call gud-reset or gdb-reset. (gud-menu-map, gud-tool-bar-map, gdb): Change gud-goto to gud-until. @@ -6870,7 +6858,7 @@ to find out if variable shuld be dereferenced. (gud-display1): Exit if there is `No symbol'. (gdb-expressions-mode-map): Correction to key-binding. - (gdb-reset): New function. Reset environment at end of debugging. + (gdb-reset): New function. Reset environment at end of debugging. (gdb-quit): Remove. 2003-01-10 Dave Love <fx@gnu.org> @@ -6960,7 +6948,7 @@ * cus-edit.el (custom-variable-prompt): Doc change. Use custom-variable-p. (customize-option): Remove search in loaddefs.el. - (customize-apropos): Use custom-variable-p. + (customize-apropos): Use custom-variable-p. (custom-save-variables): Use custom-variable-p to detect non-rogue variables. @@ -7159,7 +7147,7 @@ (gdb-mouse-goto-breakpoint, gdb-frames-select): New functions. (gdb-frames-mouse-select): Simplify. Make keybindings (gdb-goto-breakpoint, gdb-frames-select, etc) - consistent with other modes in emacs. + consistent with other modes in Emacs. (gdb-display-source-buffer): Return window of source buffer for (gud-display-line). @@ -7395,8 +7383,8 @@ 2002-12-21 Nick Roberts <nick@nick.uklinux.net> - * gdb-ui.el: Remove the concept of an instance. This means that - a lot of functions have been renamed. Accessors are prefixed with + * gdb-ui.el: Remove the concept of an instance. This means that + a lot of functions have been renamed. Accessors are prefixed with gdb-get, setters with gdb-set and the word instance has been removed from many function and variable names. (gdb-display-buffer): Protect source buffer as well @@ -7575,7 +7563,7 @@ 2002-12-13 Markus Rost <rost@math.ohio-state.edu> * emacs-lisp/easy-mmode.el (define-minor-mode): - Use `custom-current-group'. Pass all groups to the hook. + Use `custom-current-group'. Pass all groups to the hook. (easy-mmode-define-global-mode): Use `custom-current-group'. * international/mule-cmds.el (current-language-environment): @@ -7972,7 +7960,7 @@ 2002-12-02 Fran,Ag(Bois Pinard <pinard@iro.umontreal.ca> * progmodes/make-mode.el (makefile-font-lock-keywords): Highlight - more make keywords: defined, endef, override, export, unexport + more make keywords: defined, endef, override, export, unexport and vpath. 2002-12-02 Dave Love <fx@gnu.org> @@ -7993,7 +7981,7 @@ 2002-11-30 Nick Roberts <nick@nick.uklinux.net> * gdb-ui.el (gdb-many-windows): Define as a minor mode. - (toggle-gdb-windows): Remove. (Patch from Stefan Monnier) + (toggle-gdb-windows): Remove. (Patch from Stefan Monnier) * tooltip.el (tooltip-gud-process-output): Handle annotations that are output with gdba in gdb-ui.el. @@ -8028,7 +8016,7 @@ Make search for message delimiter case-sensitive. * simple.el (yank-window-start): New variable. - (yank): Record yank-window-start + (yank): Record yank-window-start. (yank-pop): Use yank-window-start. * info.el (Info-additional-directory-list): Doc fix. @@ -8115,7 +8103,7 @@ * tooltip.el (tooltip-gud-print-command): Add server prefix to the print command for gdb to keep it out of the command history. - * gdb-ui.el: Major re-organisation. Simplify legacy gdba + * gdb-ui.el: Major re-organisation. Simplify legacy gdba code to allow only one gdb process. 2002-11-23 Markus Rost <rost@math.ohio-state.edu> @@ -8129,7 +8117,7 @@ 2002-11-21 Nick Roberts <nick@nick.uklinux.net> - * gdb-ui.el : General tidying. Patches from Stefan Monnier. + * gdb-ui.el : General tidying. Patches from Stefan Monnier. 2002-11-20 Simon Josefsson <jas@extundo.com> @@ -9372,11 +9360,11 @@ append slash only if result doesn't end in a slash already. (tramp-handle-file-truename): Restructure logic. If list of steps is nil, return "/" as the real name. - (tramp-completion-mode): Add "\\(" and "\\)". Otherwise, + (tramp-completion-mode): Add "\\(" and "\\)". Otherwise, `match-string' doesn't make sense. From Michael Albinus. - (tramp-host-with-port-regexp): New defcustom. Equal to previous + (tramp-host-with-port-regexp): New defcustom. Equal to previous `tramp-host-regexp'. From Michael Albinus. - (tramp-host-regexp): Taken off hashes in host names. Otherwise, + (tramp-host-regexp): Taken off hashes in host names. Otherwise, scanning files like .rhosts would take comments as host names. From Michael Albinus. (tramp-file-name-structure, tramp-multi-file-name-hop-structure): @@ -9441,8 +9429,8 @@ menu pseudo-keys generated by easymenu which are lowercase in Emacs 22.1. - * progmodes/ada-xref.el - (ada-xref-update-project-menu,ada-add-ada-menu): Ditto. + * progmodes/ada-xref.el (ada-xref-update-project-menu) + (ada-add-ada-menu): Ditto. 2002-10-03 John Paul Wallington <jpw@shootybangbang.com> @@ -10009,7 +9997,7 @@ (occur-next, occur-prev): Use it. * progmodes/sh-script.el (sh-mark-init): Don't set `occur-buffer'. - (sh-mark-line): Likewise. Use 'occur-target and 'occur-match + (sh-mark-line): Likewise. Use 'occur-target and 'occur-match instead of 'occur and 'occur-point. * eshell/em-unix.el (eshell-occur-mode-mouse-goto) @@ -10096,7 +10084,7 @@ (tramp-parse-netrc, tramp-parse-netrc-group): New functions. (tramp-user-regexp): " \t" are not user regexp characters. (tramp-completion-handle-file-name-all-completions): - Remove Ange-FTP cmpletion. It has a bug not handling the "/ftp:" prefix + Remove Ange-FTP cmpletion. It has a bug not handling the "/ftp:" prefix completely, and it returns local completions as well. (tramp-completion-function-alist-ftp): New constant. (tramp-completion-function-alist): Add completion function for "ftp". @@ -10275,27 +10263,26 @@ 2002-09-07 Michael Albinus <Michael.Albinus@alcatel.de> * net/tramp.el (tramp-methods): Remove `tramp-completion-function' - entries. They are handled now by `tramp-completion-function-alist'. - (tramp-completion-function): Defvar removed. I've never used - it. Hmm. + entries. They are handled now by `tramp-completion-function-alist'. + (tramp-completion-function): Defvar removed. I've never used it. Hmm. (tramp-get-completion-function) (tramp-get-completion-rsh, tramp-get-completion-ssh) (tramp-get-completion-telnet, tramp-get-completion-su): Functions removed as well. Not necessary any longer due to extended customization means. - (tramp-completion-function-alist): New defcustom. Holds all + (tramp-completion-function-alist): New defcustom. Holds all FUNCTION FILE pairs used for user and host name completion relevant for METHOD. (tramp-completion-function-alist-rsh) (tramp-completion-function-alist-ssh) (tramp-completion-function-alist-telnet) (tramp-completion-function-alist-su): Defconst for initializing - `tramp-completion-function-alist'. Unfortunately, mainly UNIX-like - values are known for me until now. Needs to be completed for at + `tramp-completion-function-alist'. Unfortunately, mainly UNIX-like + values are known for me until now. Needs to be completed for at least VMS++ like operating systems. (tramp-set-completion-function) (tramp-get-completion-function): New functions for configuration - of `tramp-completion-function-alist'. The old definition of + of `tramp-completion-function-alist'. The old definition of `tramp-get-completion-function' has been discarded. (tramp-completion-handle-file-name-all-completions): Change function call for user/host completion according to definition @@ -10332,7 +10319,7 @@ (tramp-get-completion-user-host): Accept user names as they are if typed until "@". (tramp-completion-mode): Replace `last-input-char' by modern - `last-input-event'. Check for `event-modifiers'. + `last-input-event'. Check for `event-modifiers'. 2002-09-06 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> @@ -10391,8 +10378,8 @@ (tramp-make-multi-tramp-file-format-unified) (tramp-make-multi-tramp-file-format-separate): Removed. (tramp-make-tramp-file-name): Allow partial tramp file - names. Generate tramp file format on-the-fly depending on - parameters. Apply atomar format strings resp expressions. + names. Generate tramp file format on-the-fly depending on + parameters. Apply atomar format strings resp expressions. (tramp-get-completion-methods) (tramp-get-completion-user-host): Apply `tramp-make-tramp-file-name'. (tramp-parse-hosts-group): Take all host names and IP addresses @@ -10444,7 +10431,7 @@ * net/tramp.el (tramp-get-completion-methods) (tramp-get-completion-rsh) - (tramp-get-completion-ssh): Add "[" for Xemacs. + (tramp-get-completion-ssh): Add "[" for XEmacs. (tramp-completion-file-name-regexp-separate): Expression adapted. (tramp-completion-file-name-handler-alist): Add handler for `file-name-directory' and `file-name-nondirectory'. @@ -10455,7 +10442,7 @@ (tramp-completion-handle-file-name-all-completions): Apply `tramp-completion-run-real-handler'. (tramp-parse-rhosts) - (tramp-parse-shosts): Use `with-temp-buffer'. `result$,1!=(B renamed to + (tramp-parse-shosts): Use `with-temp-buffer'. `result' renamed to `res' (otherwise side effects in XEmacs). 2002-08-24 Michael Albinus <Michael.Albinus@alcatel.de> @@ -10470,7 +10457,7 @@ (tramp-get-completion-ssh): Doc string tuned. (tramp-methods): Doc string and custom type extended for `tramp-completion-function'. - (tramp-completion-function): Variable added. Is it really used? + (tramp-completion-function): Variable added. Is it really used? Other variables like `tramp-completion-function' aren't used. (tramp-completion-file-name-handler-alist): Add handler for `file-name-completion'. @@ -10518,7 +10505,7 @@ * net/tramp.el (tramp-invoke-ange-ftp): `tramp-disable-ange-ftp' must be called again after activating `ange-ftp'. - (tramp-ange-ftp-file-name-p): Check for Xemacs. + (tramp-ange-ftp-file-name-p): Check for XEmacs. 2002-08-08 Michael Albinus <Michael.Albinus@alcatel.de> @@ -10528,7 +10515,7 @@ tramp-invoke-ange-ftp 'write-region. (tramp-handle-set-file-modes): Change order of FILENAME and MODE passing to tramp-invoke-ange-ftp 'set-file-modes. - (tramp-flatten-list): New function. Maybe this functionality does + (tramp-flatten-list): New function. Maybe this functionality does exist already elsewhere in the libraries. (tramp-invoke-ange-ftp): Apply `tramp-flatten-list' to parameter list in order to avoid nested lists, f.e. when invoked from @@ -10660,7 +10647,7 @@ 2002-09-18 Luc Teirlinck <teirllm@mail.auburn.edu> - * ielm.el: (*1, *2, *3): New variables. + * ielm.el (*1, *2, *3): New variables. (ielm-eval-input): Make temporary buffers current on entry and exit to the let bindings for *, ** and ***. (inferior-emacs-lisp-mode): Mention *1, *2 and *3 in the docstring. @@ -10961,7 +10948,7 @@ 2002-09-12 Simon Josefsson <jas@extundo.com> * mail/smtpmail.el (smtpmail-send-it): Don't use : in filenames - (for cygwin). Suggested by Andrew Senior <aws@watson.ibm.com>. + (for cygwin). Suggested by Andrew Senior <aws@watson.ibm.com>. Use expand-file-name. Also don't require time-stamp. 2002-09-11 Richard M. Stallman <rms@gnu.org> @@ -11259,7 +11246,7 @@ 2002-09-08 Kim F. Storm <storm@cua.dk> * kmacro.el (kmacro-end-and-call-macro): New command to end and - call keyboard macro in one step. Bind it to C-x e by default. + call keyboard macro in one step. Bind it to C-x e by default. (kmacro-call-macro): Use format-kbd-macro. (kmacro-step-edit-macro): New command to interactively step edit and execute last keyboard macro. @@ -11459,7 +11446,7 @@ From Michael Albinus <Michael.Albinus@alcatel.de>: * net/tramp.el (tramp-invoke-ange-ftp): - (tramp-ange-ftp-file-name-p): Check for Xemacs. + (tramp-ange-ftp-file-name-p): Check for XEmacs. (tramp-do-copy-or-rename-file): Don't pass KEEP-DATE to tramp-invoke-ange-ftp 'rename. (tramp-handle-write-region): Don't pass LOCKNAME and CONFIRM to @@ -12552,7 +12539,7 @@ * warnings.el (lwarn, warn, warning-levels): Doc fix. (warning-suppress-log-types): Fix typo. - (display-warning): Fix typo. Remove useless assignment to free variable + (display-warning): Fix typo. Remove useless assignment to free variable `group-string'. 2002-07-25 Markus Rost <rost@math.ohio-state.edu> @@ -12758,8 +12745,8 @@ * textmodes/reftex-vars.el (reftex-index-verify-function): New option. (reftex-bibliography-commands): New option. - (reftex-toc-split-windows-horizontally): New option - (reftex-toc-split-windows-horizontally-fraction): New option + (reftex-toc-split-windows-horizontally): New option. + (reftex-toc-split-windows-horizontally-fraction): New option. (reftex-include-file-commands): New option. (reftex-cite-format-builtin): Added ?n for nocite. @@ -12768,7 +12755,7 @@ * textmodes/reftex-toc.el (reftex-re-enlarge): Handle horizontal splitting. - (reftex-toc): Handle horizontal splitting + (reftex-toc): Handle horizontal splitting. (reftex-last-window-width): New variable. * textmodes/reftex-parse.el (reftex-locate-bibliography-files): @@ -13371,8 +13358,8 @@ * files.el (after-find-file): Don't check for read-only status of files just created (and not yet saved on disk). - * ido.el (ido-completion-help): Changed xemacs specific code to - avoid byte compiler warning in GNU emacs. + * ido.el (ido-completion-help): Changed XEmacs specific code to + avoid byte compiler warning in GNU Emacs. (ido-set-matches1): Use regexp-quote instead of identity. (ido-complete-space): New function. (ido-define-mode-map): Bind it to SPACE. @@ -13696,7 +13683,7 @@ * faces.el (describe-face): Capitalize "not documented" message. * help-fns.el (describe-variable): Likewise. - (describe-function-1): Likewise. Also, document the obsolescence + (describe-function-1): Likewise. Also, document the obsolescence of the function, if applicable. 2002-06-26 Juanma Barranquero <lektu@terra.es> @@ -14169,7 +14156,7 @@ (comint-send-input, comint-output-filter): Use text properties instead of overlays. (comint-insert-clicked-input): Rewrite to work with text - properties as well as overlays + properties as well as overlays. (comint-snapshot-last-prompt): Snapshot using text properties. (comint-get-old-input-default, comint-extract-string): Don't copy text properties. @@ -14190,7 +14177,7 @@ (italic): Try underlining for displays that don't support real italics. * cus-edit.el (custom-display): Add support for `supports' predicate. * term/tty-colors.el (color-name-rgb-alist): Use 16-bit RGB values - instead of 8-bit, for consistency with the rest of emacs. + instead of 8-bit, for consistency with the rest of Emacs. (tty-color-canonicalize): Only copy COLOR if we need to change it. (tty-color-approximate): Scale values from `color-name-rgb-alist' appropriately. Return the whole color description, rather than @@ -14553,7 +14540,7 @@ 2002-05-24 Glenn Morris <gmorris@ast.cam.ac.uk> - * progmodes/f90.el: (f90-end-of-subprogram): Remove the final + * progmodes/f90.el (f90-end-of-subprogram): Remove the final `forward-line'. (f90-end-of-block, f90-beginning-of-block, f90-next-block-end) (f90-previous-block-start): New navigation commands. @@ -14587,7 +14574,7 @@ (apropos-calc-scores, apropos-score-str, apropos-score-doc) (apropos-score-symbol): New functions. (apropos-command, apropos, apropos-value, apropos-documentation): - Allow keywords in addition to regexp. Added scoring. + Allow keywords in addition to regexp. Added scoring. (apropos-documentation-check-doc-file) (apropos-documentation-check-elc-file): Added scoring. (apropos-print): Sort according to score. @@ -15271,7 +15258,7 @@ (mouse-wheel-scroll-screen): Remove. ([mouse-wheel], [C-mouse-wheel], [S-mouse-wheel]): Use mwheel-scroll. - * w32-vars.el: (mouse-wheel-scroll-amount): Remove. + * w32-vars.el (mouse-wheel-scroll-amount): Remove. 2002-05-04 Markus Rost <rost@math.ohio-state.edu> @@ -15673,9 +15660,9 @@ (sendmail-send-it): Use it. * mail/smtpmail.el (smtpmail-queue-counter): New variable. - (smtpmail-send-it): Use it to construct new queue filenames - (needed if you send more than one message per second, which is - possible if you use Gnus Agent). + (smtpmail-send-it): Use it to construct new queue filenames (needed + if you send more than one message per second, which is possible if + you use Gnus Agent). * mail/smtpmail.el (smtpmail-auth-credentials): Support netrc files as well. @@ -15950,8 +15937,8 @@ 2002-04-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> - * international/mule-diag.el (list-input-methods-1): Doc fix - (LEIM is now part of the standard distribution). + * international/mule-diag.el (list-input-methods-1): Doc fix (LEIM is + now part of the standard distribution). * tmm.el (tmm-completion-prompt): Doc fix. @@ -15964,14 +15951,14 @@ 2002-04-22 Martin Stjernholm <bug-cc-mode@gnu.org> - * progmodes/cc-mode.el: (c-define-abbrev-table): New function to + * progmodes/cc-mode.el (c-define-abbrev-table): New function to pass the SYSTEM-FLAG to `define-abbrev' in a way that works in emacsen that doesn't support it. 2002-04-22 Martin Stjernholm <bug-cc-mode@gnu.org> * progmodes/cc-align.el, progmodes/cc-engine.el, - progmodes/cc-styles.el, progmodes/cc-vars.el + * progmodes/cc-styles.el, progmodes/cc-vars.el (c-guess-basic-syntax, c-lineup-topmost-intro-cont): Find correct anchor for statement-cont in top level constructs. Analyze variable initializations in top level constructs as @@ -16480,7 +16467,7 @@ and macros. (c-in-literal): No longer recognizes macros as literals by - default. An extra flag argument is required to do that. + default. An extra flag argument is required to do that. (c-macro-start, c-query-macro-start) (c-query-and-set-macro-start): Added a cache for the macro @@ -16668,9 +16655,9 @@ (c-least-enclosing-brace): Added optional second arg to limit the search to before a certain point. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug - which could cause incorrect analysis if a cached state is used - (usually only happens when an electric key reindents a line). + * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug which + could cause incorrect analysis if a cached state is used (usually + only happens when an electric key reindents a line). 2002-04-22 Martin Stjernholm <bug-cc-mode@gnu.org> @@ -16848,9 +16835,9 @@ (scroll-all-beginning-of-buffer-all, scroll-all-end-of-buffer-all): New functions. - * files.el: (auto-mode-alist): .f95 files in f90-mode. + * files.el (auto-mode-alist): .f95 files in f90-mode. - * progmodes/fortran.el: (fortran-beginning-do): Make regexp match + * progmodes/fortran.el (fortran-beginning-do): Make regexp match a DO statement irrespective of numeric label. 2002-04-20 Glenn Morris <gmorris@ast.cam.ac.uk> @@ -16956,7 +16943,7 @@ 2002-04-16 Michael Kifer <kifer@cs.stonybrook.edu> - * viper-ex.el: Patch by Samuel Padgett. Copyright papers received. + * viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. @@ -17448,7 +17435,7 @@ 2002-04-02 Mike Williams <mdub@bigfoot.com> * textmodes/sgml-mode.el (sgml-close-tag): Rename from - sgml-insert-end-tag. Simplify by using sgml-lexical-context. + sgml-insert-end-tag. Simplify by using sgml-lexical-context. (sgml-get-context): Remove use of sgml-inside-tag-p. (sgml-inside-tag-p): Remove. (sgml-looking-back-at): Short-circuit at beg of buffer. @@ -17493,7 +17480,7 @@ * textmodes/xml-lite.el: Removed much redundant stuff. (xml-lite-parse-tag-backward): Simplify parsing by assuming we - always start within text. Make use of sgml-unclosed-tag-p. + always start within text. Make use of sgml-unclosed-tag-p. 2002-04-01 Ville Skytt,Ad(B <ville.skytta@xemacs.org> @@ -18368,7 +18355,7 @@ * ediff-init.el: Comments. - * ediff-hook.el: Got rid of autoloads. Not needed, since the hook + * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories) @@ -18377,13 +18364,13 @@ (ediff-draw-dir-diffs): Now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): New function that implements copying - of files from one Ediff dir to another + of files from one Ediff dir to another. (ediff-bury-dir-diffs-buffer): Kills the buffer instead. (ediff-append-custom-diff): Better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): Buglet fix. (ediff-inferior-compare-regions): Use - ediff-clone-buffer-for-region-comparison. Better and simpler interface. + ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface. @@ -18735,7 +18722,7 @@ 2002-02-22 Eli Zaretskii <eliz@is.elta.co.il> - Support for ICCCM Extended Segments in X selections: + Support for ICCCM Extended Segments in X selections: * international/mule-conf.el (ctext-no-compositions): New coding system. @@ -19060,8 +19047,7 @@ `current-language-environment' and `default-input-method' when marked as customized. - * international/mule-cmds.el - (setup-specified-language-environment): + * international/mule-cmds.el (setup-specified-language-environment): Mark `current-language-environment' as customized. (set-input-method): Mark `default-input-method' as customized when called interactively. @@ -19140,7 +19126,7 @@ 2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu> * viper-util.el (viper-read-key-sequence): Fix so it'll read - fast key sequences in emacs native mode + fast key sequences in Emacs native mode. (viper-events-to-keys): Delete. * viper.el (describe-key, describe-key-briefly): Get rid of @@ -19150,7 +19136,7 @@ Use ediff-has-gutter-support. * ediff-util.el (ediff-dispose-of-variant-according-to-user): - check if buff is alive. + Check if buff is alive. * ediff.el: Typo in comment. @@ -19398,7 +19384,7 @@ * textmodes/flyspell.el (flyspell-issue-message-flag): New user option. (flyspell-mode-on, flyspell-notify-misspell) (flyspell-small-region, flyspell-external-point-words) - (flyspell-large-region): Use it + (flyspell-large-region): Use it. (flyspell-before-incorrect-word-string) (flyspell-after-incorrect-word-string): New user options. (make-flyspell-overlay): Use them. @@ -19705,7 +19691,7 @@ 2002-01-20 Colin Walters <walters@verbum.org> - * ibuffer.el: (toplevel) Require `ibuf-ext', which is now compiled + * ibuffer.el (toplevel): Require `ibuf-ext', which is now compiled with `byte-compile-dynamic'. (ibuffer-default-directory, toplevel): Doc files. @@ -19884,7 +19870,7 @@ Move view-emacs-FAQ from F to C-f. Move view-emacs-problems from P to C-e. Bindings moved here from mule-cmds.el. - C-l binding for describe-language-environment deleted + C-l binding for describe-language-environment deleted. (help-for-help): Update for all these changes. * emacs-lisp/copyright.el (copyright-regexp): Make (C) optional. @@ -20049,12 +20035,12 @@ 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): - new macro that replaces viper-emacs-p and viper-xemacs-p in many - cases. Used to reduce the number of warnings. + New macro that replaces viper-emacs-p and viper-xemacs-p in many + cases. Used to reduce the number of warnings. * viper-cmd.el: Use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): Move here from viper.el. - (viper-set-unread-command-events): Move to viper-util.el + (viper-set-unread-command-events): Move to viper-util.el. (viper-check-minibuffer-overlay): Make sure viper-minibuffer-overlay is moved to cover the entire input field. @@ -20265,8 +20251,8 @@ 2002-01-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> - * time.el (display-time-load-average-threshold): Fix defcustom - (add type and group). + * time.el (display-time-load-average-threshold): + Fix defcustom (add type and group). * net/ange-ftp.el (ange-ftp-shell-command): Remove port specification from the hostname. @@ -21003,7 +20989,7 @@ * language/ind-util.el: Don't require cl. (indian-glyph-char, indian-glyph-max-char) - (indian-char-glyph): Moved from indian.el + (indian-char-glyph): Moved from indian.el. (indian--puthash-char, mapthread): Don't quote lambda. (indian--map): New function. (indian--puthash-v, indian--puthash-c, indian--puthash-m) @@ -21766,7 +21752,7 @@ 2001-11-25 ShengHuo ZHU <zsh@cs.rochester.edu> - * mail/rmail.el (rmail-enable-mime-composing): New. A lightweight + * mail/rmail.el (rmail-enable-mime-composing): New. A lightweight version of rmail-enable-mime. (rmail-forward): Use it. @@ -21888,8 +21874,8 @@ 2001-11-22 Colin Walters <walters@debian.org> - * calc/calc-misc.el (calc-info): Don't perform voodoo, just - (info "Calc"). + * calc/calc-misc.el (calc-info): Don't perform voodoo, + just (info "Calc"). (report-calc-bug): Use reporter.el. * mail/reporter.el (reporter-submit-bug-report): Doc fixes. @@ -22028,7 +22014,7 @@ * emacs-lisp/lisp.el (mark-sexp): Mark more if repeated. - * progmodes/cc-engine.el (c-parse-state): Typo. From Martin Stjernholm. + * progmodes/cc-engine.el (c-parse-state): Typo. From Martin Stjernholm. * mwheel.el (mouse-wheel-scroll-amount): Allow float values. (mouse-wheel-progessive-speed): New var. @@ -22600,7 +22586,7 @@ * calc/calc-macs.el (calc-record-compilation-date-macro): Return a simple `setq' form. - * calc/calc-ext.el: (toplevel): Require calc. + * calc/calc-ext.el (toplevel): Require calc. (calc-fancy-prefix-map): New. (calc-fancy-prefix): Use it. (calc-fancy-prefix-other-key): New. @@ -23233,7 +23219,7 @@ 2001-10-26 Jason Rumney <jasonr@gnu.org> - * w32-fns.el: (w32-charset-info-alist): Use ANSI for iso10646-1 + * w32-fns.el (w32-charset-info-alist): Use ANSI for iso10646-1 when UNICODE is not defined. 2001-10-26 Sam Steingold <sds@gnu.org> @@ -23267,7 +23253,7 @@ (ps-mode-menu-main): Submenu with options on/off was replaced with a toggle button. (ps-mode, ps-run-mode): Define with `define-derived-mode' - (ps-mode): Autoload cookie added on same line as comment + (ps-mode): Autoload cookie added on same line as comment. (ps-mode-tabkey, ps-mode-backward-delete-char): (ps-mode-r-balance): Replace `delete-horizontal-space' and `indent-to' with `indent-line-to' @@ -23547,7 +23533,8 @@ See ChangeLog.9 for earlier changes. ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11 index f9c93d4102e..4de116f8bf9 100644 --- a/lisp/ChangeLog.11 +++ b/lisp/ChangeLog.11 @@ -14336,7 +14336,7 @@ See ChangeLog.10 for earlier changes. ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index fd97c5a07aa..cc94f4ff64f 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -3994,7 +3994,8 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc. + Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index af6d2f0c382..66bad2c8021 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -12615,7 +12615,8 @@ See ChangeLog.2 for earlier changes. - Copyright (C) 1989, 1993 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index 2e852552f05..30fa3124635 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 @@ -8939,7 +8939,8 @@ See ChangeLog.3 for earlier changes. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index 5aedc76efed..a070a2cf7a4 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -9261,7 +9261,8 @@ See ChangeLog.4 for earlier changes. - Copyright (C) 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 356715b8d09..dfa9dfae61b 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -8021,7 +8021,8 @@ Wed Jul 26 15:40:00 Michael Kifer (kifer@cs.sunysb.edu) See ChangeLog.5 for earlier changes. - Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index f89cb7b0d47..fa07ccc187b 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -23139,7 +23139,8 @@ See ChangeLog.6 for earlier changes. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index b59c0bd27ec..7aaaed4196f 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -10012,7 +10012,8 @@ See ChangeLog.7 for earlier changes. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 6bd0b347c30..78c0734ddd9 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -20695,7 +20695,8 @@ See ChangeLog.8 for earlier changes. ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/abbrev.el b/lisp/abbrev.el index 234b8230587..b0ceaa5522d 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -1,6 +1,6 @@ ;;; abbrev.el --- abbrev mode commands for Emacs -;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el index d52ccffeb3c..065d4eacabc 100644 --- a/lisp/abbrevlist.el +++ b/lisp/abbrevlist.el @@ -1,6 +1,6 @@ ;;; abbrevlist.el --- list one abbrev table alphabetically ordered -;; Copyright (C) 1986, 1992, 2002, 2003, 2004, +;; Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Suggested by a previous version by Gildea. diff --git a/lisp/add-log.el b/lisp/add-log.el index a1208d5fdd6..2ecb274b4de 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -1,7 +1,7 @@ ;;; add-log.el --- change log maintenance commands for Emacs -;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2002, -;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001, +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: tools @@ -916,7 +916,19 @@ Has a preference of looking backwards." ;; Include certain keywords if they ;; precede the name. (setq middle (point)) - (forward-sexp -1) + ;; Single (forward-sexp -1) invocation is + ;; not enough for C++ member function defined + ;; as part of nested class and/or namespace + ;; like: + ;; + ;; void + ;; foo::bar::baz::bazz () + ;; { ... + ;; + ;; Here we have to move the point to + ;; the beginning of foo, not bazz. + (while (not (looking-back "\\(^\\|[ \t]\\)")) + (forward-sexp -1)) ;; Is this C++ method? (when (and (< 2 middle) (string= (buffer-substring (- middle 2) diff --git a/lisp/align.el b/lisp/align.el index b40f96e7f83..0a0144ee65a 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -1,9 +1,10 @@ ;;; align.el --- align text to a specific column, by regexp -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: John Wiegley <johnw@gnu.org> +;; Author: John Wiegley <johnw@gnu.org> +;; Maintainer: FSF ;; Keywords: convenience languages lisp ;; This file is part of GNU Emacs. @@ -1074,7 +1075,7 @@ current position." (eq (char-before pos) ?\\)) (setq count (1+ count) pos (1- pos))) (eq (mod count 2) 1)) - (goto-char (match-beginning 2)))) + (goto-char (match-beginning (if reverse 1 2))))) result)) (defun align-new-section-p (beg end separator) diff --git a/lisp/allout.el b/lisp/allout.el index 74d87a00edf..02d67671008 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -45,7 +45,9 @@ ;; - Symmetric-key and key-pair topic encryption, plus symmetric passphrase ;; mnemonic support, with verification against an established passphrase ;; (using a stashed encrypted dummy string) and user-supplied hint -;; maintenance. (See allout-toggle-current-subtree-encryption docstring.) +;; maintenance. (See allout-toggle-current-subtree-encryption docstring. +;; Currently only GnuPG encryption is supported, and integration +;; with gpg-agent is not yet implemented.) ;; - Automatic topic-number maintenance ;; - "Hot-spot" operation, for single-keystroke maneuvering and ;; exposure control (see the allout-mode docstring) @@ -162,7 +164,7 @@ The types of elements in the layout specification are: : - repeat spec - apply the preceeding element to all siblings at current level, *up to* those siblings that would be covered by specs following the `:' on the list. Ie, apply to all topics at level but - trailing ones accounted for by trailing specs. \(Only the first of + trailing ones accounted for by trailing specs. (Only the first of multiple colons at the same level is honored - later ones are ignored.) * - completely exposes the topic, including bodies + - exposes all subtopics, but not the bodies @@ -230,9 +232,9 @@ advance as follows: - if the cursor is on the headline and not the start of the headline: then it goes to the start of the headline - if the cursor is on the start of the headline: - then it goes to the bullet character \(for hotspot navigation\) + then it goes to the bullet character (for hotspot navigation) - if the cursor is on the bullet character: - then it goes to the first column of that line \(the headline\) + then it goes to the first column of that line (the headline) - if the cursor is on the first column of the headline: then it goes to the start of the headline within the item body. @@ -324,14 +326,14 @@ of this var to take effect." These bullets are used to distinguish topics from the run-of-the-mill ones. They are not used in the standard topic headers created by -the topic-opening, shifting, and rebulleting \(eg, on topic shift, +the topic-opening, shifting, and rebulleting (eg, on topic shift, topic paste, blanket rebulleting) routines, but are offered among the choices for rebulleting. They are not altered by the above automatic rebulleting, so they can be used to characterize topics, eg: `?' question topics - `\(' parenthetic comment \(with a matching close paren inside) - `[' meta-note \(with a matching close ] inside) + `(' parenthetic comment (with a matching close paren inside) + `[' meta-note (with a matching close ] inside) `\"' a quotation `=' value settings `~' \"more or less\" @@ -367,13 +369,13 @@ String values are used as literals, not regular expressions, so do not escape any regulare-expression characters. Value t means to first check for assoc value in `allout-mode-leaders' -alist, then use comment-start string, if any, then use default \(`.'). +alist, then use comment-start string, if any, then use default (`.'). \(See note about use of comment-start strings, below.) Set to the symbol for either of `allout-mode-leaders' or `comment-start' to use only one of them, respectively. -Value nil means to always use the default \(`.') and leave +Value nil means to always use the default (`.') and leave `allout-primary-bullet' unaltered. comment-start strings that do not end in spaces are tripled in @@ -605,7 +607,7 @@ The idea is to prevent file-system exposure of any un-encrypted stuff, and mostly covers both deliberate file writes and auto-saves. - Yes: encrypt all topics pending encryption, even if it's the one - currently being edited. \(In that case, the currently edited topic + currently being edited. (In that case, the currently edited topic will be automatically decrypted before any user interaction, so they can continue editing but the copy on the file system will be encrypted.) @@ -619,7 +621,7 @@ mostly covers both deliberate file writes and auto-saves. - No: leave it to the user to encrypt any unencrypted topics. For practical reasons, auto-saves always use the 'except-current policy -when auto-encryption is enabled. \(Otherwise, spurious passphrase prompts +when auto-encryption is enabled. (Otherwise, spurious passphrase prompts and unavoidable timing collisions are too disruptive.) If security for a file requires that even the current topic is never auto-saved in the clear, disable auto-saves for that file." @@ -717,8 +719,8 @@ unless optional third, non-nil element is present.") You can customize this setting to set it for all allout buffers, or set it in individual buffers if you want to inhibit auto-fill only in particular -buffers. \(You could use a function on `allout-mode-hook' to inhibit -auto-fill according, eg, to the major mode.\) +buffers. (You could use a function on `allout-mode-hook' to inhibit +auto-fill according, eg, to the major mode.) If you don't set this and auto-fill-mode is enabled, allout will use the value that `normal-auto-fill-function', if any, when allout mode starts, or @@ -783,7 +785,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring." ;;;_ : Version ;;;_ = allout-version (defvar allout-version "2.2.1" - "Version of currently loaded outline package. \(allout.el)") + "Version of currently loaded outline package. (allout.el)") ;;;_ > allout-version (defun allout-version (&optional here) "Return string describing the loaded outline version." @@ -800,7 +802,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring." (defvar allout-layout nil ; LEAVE GLOBAL VALUE NIL - see docstring. "Buffer-specific setting for allout layout. -In buffers where this is non-nil \(and if `allout-init' has been run, to +In buffers where this is non-nil (and if `allout-init' has been run, to enable this behavior), `allout-mode' will be automatically activated. The layout dictated by the value will be used to set the initial exposure when `allout-mode' is activated. @@ -812,12 +814,12 @@ The value would typically be set by a file local variable. For example, the following lines at the bottom of an Emacs Lisp file: ;;;Local variables: -;;;allout-layout: \(0 : -1 -1 0) +;;;allout-layout: (0 : -1 -1 0) ;;;End: dictate activation of `allout-mode' mode when the file is visited \(presuming allout-init was already run), followed by the -equivalent of `\(allout-expose-topic 0 : -1 -1 0)'. \(This is +equivalent of `(allout-expose-topic 0 : -1 -1 0)'. (This is the layout used for the allout.el source file.) `allout-default-layout' describes the specification format. @@ -930,7 +932,7 @@ Works according to settings of: `allout-use-mode-specific-leader' and `allout-mode-leaders'. -Apply this via \(re)activation of `allout-mode', rather than +Apply this via (re)activation of `allout-mode', rather than invoking it directly." (let* ((use-leader (and (boundp 'allout-use-mode-specific-leader) (if (or (stringp allout-use-mode-specific-leader) @@ -977,7 +979,7 @@ invoking it directly." (defun allout-infer-body-reindent () "Determine proper setting for `allout-reindent-bodies'. -Depends on default setting of `allout-reindent-bodies' \(which see) +Depends on default setting of `allout-reindent-bodies' (which see) and presence of setting for `comment-start', to tell whether the file is programming code." (if (and allout-reindent-bodies @@ -1295,7 +1297,7 @@ their settings before allout-mode was started." "Symbol for use as allout invisible-text overlay category.") ;;;_ x allout-view-change-hook (defvar allout-view-change-hook nil - "*\(Deprecated\) A hook run after allout outline exposure changes. + "*(Deprecated) A hook run after allout outline exposure changes. Switch to using `allout-exposure-change-hook' instead. Both hooks are currently respected, but the other conveys the details of the exposure @@ -1531,12 +1533,12 @@ So `allout-post-command-business' should not reactivate it...") MODE is one of the following symbols: - - nil \(or no argument) deactivate auto-activation/layout; + - nil (or no argument) deactivate auto-activation/layout; - `activate', enable auto-activation only; - `ask', enable auto-activation, and enable auto-layout but with confirmation for layout operation solicited from user each time; - `report', just report and return the current auto-activation state; - - anything else \(eg, t) for auto-activation and auto-layout, without + - anything else (eg, t) for auto-activation and auto-layout, without any confirmation check. Use this function to setup your Emacs session for automatic activation @@ -1598,7 +1600,7 @@ the following two lines in your Emacs init file: ((eq mode 'ask) (message (concat "Outline mode auto-activation and " - "-layout \(upon confirmation) enabled.")) + "-layout (upon confirmation) enabled.")) 'ask) ((message "Outline mode auto-activation and -layout enabled.") @@ -1649,92 +1651,111 @@ symbol. Allout outline mode always runs as a minor mode. Allout outline mode provides extensive outline oriented formatting and manipulation. It enables structural editing of outlines, as well as navigation and exposure. It also is specifically aimed at -accommodating syntax-sensitive text like programming languages. \(For +accommodating syntax-sensitive text like programming languages. (For an example, see the allout code itself, which is organized as an allout outline.) -In addition to outline navigation and exposure, allout includes: +In addition to typical outline navigation and exposure, allout includes: - - topic-oriented repositioning, promotion/demotion, cut, and paste - - integral outline exposure-layout + - topic-oriented authoring, including keystroke-based topic creation, + repositioning, promotion/demotion, cut, and paste - incremental search with dynamic exposure and reconcealment of hidden text - - automatic topic-number maintenance + - adjustable format, so programming code can be developed in outline-structure - easy topic encryption and decryption - - \"Hot-spot\" operation, for single-keystroke maneuvering and - exposure control. \(See the allout-mode docstring.) + - \"Hot-spot\" operation, for single-keystroke maneuvering and exposure control + - integral outline layout, for automatic initial exposure when visiting a file + - independent extensibility, using comprehensive exposure and authoring hooks and many other features. -Below is a description of the bindings, and then explanation of +Below is a description of the key bindings, and then explanation of special `allout-mode' features and terminology. See also the outline menubar additions for quick reference to many of the features, and see the docstring of the function `allout-init' for instructions on priming your emacs session for automatic activation of `allout-mode'. - -The bindings are dictated by the `allout-keybindings-list' and -`allout-command-prefix' variables. - - Navigation: Exposure Control: - ---------- ---------------- -\\[allout-next-visible-heading] allout-next-visible-heading | \\[allout-hide-current-subtree] allout-hide-current-subtree -\\[allout-previous-visible-heading] allout-previous-visible-heading | \\[allout-show-children] allout-show-children -\\[allout-up-current-level] allout-up-current-level | \\[allout-show-current-subtree] allout-show-current-subtree -\\[allout-forward-current-level] allout-forward-current-level | \\[allout-show-current-entry] allout-show-current-entry -\\[allout-backward-current-level] allout-backward-current-level | \\[allout-show-all] allout-show-all -\\[allout-end-of-entry] allout-end-of-entry -\\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot - - Topic Header Production: - ----------------------- -\\[allout-open-sibtopic] allout-open-sibtopic Create a new sibling after current topic. -\\[allout-open-subtopic] allout-open-subtopic ... an offspring of current topic. -\\[allout-open-supertopic] allout-open-supertopic ... a sibling of the current topic's parent. - - Topic Level and Prefix Adjustment: - --------------------------------- -\\[allout-shift-in] allout-shift-in Shift current topic and all offspring deeper. -\\[allout-shift-out] allout-shift-out ... less deep. -\\[allout-rebullet-current-heading] allout-rebullet-current-heading Prompt for alternate bullet for - current topic. -\\[allout-rebullet-topic] allout-rebullet-topic Reconcile bullets of topic and its offspring - - distinctive bullets are not changed, others - alternated according to nesting depth. -\\[allout-number-siblings] allout-number-siblings Number bullets of topic and siblings - the - offspring are not affected. With repeat - count, revoke numbering. - - Topic-oriented Killing and Yanking: - ---------------------------------- -\\[allout-kill-topic] allout-kill-topic Kill current topic, including offspring. -\\[allout-copy-topic-as-kill] allout-copy-topic-as-kill Copy current topic, including offspring. -\\[allout-kill-line] allout-kill-line kill-line, attending to outline structure. -\\[allout-copy-line-as-kill] allout-copy-line-as-kill Copy line but don't delete it. -\\[allout-yank] allout-yank Yank, adjusting depth of yanked topic to - depth of heading if yanking into bare topic - heading (ie, prefix sans text). -\\[allout-yank-pop] allout-yank-pop Is to allout-yank as yank-pop is to yank - - Topic-oriented Encryption: - ------------------------- -\\[allout-toggle-current-subtree-encryption] allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content - - Misc commands: - ------------- -M-x outlineify-sticky Activate outline mode for current buffer, - and establish a default file-var setting - for `allout-layout'. -\\[allout-mark-topic] allout-mark-topic -\\[allout-copy-exposed-to-buffer] allout-copy-exposed-to-buffer - Duplicate outline, sans concealed text, to - buffer with name derived from derived from that - of current buffer - \"*BUFFERNAME exposed*\". -\\[allout-flatten-exposed-to-buffer] allout-flatten-exposed-to-buffer - Like above 'copy-exposed', but convert topic - prefixes to section.subsection... numeric - format. -\\[eval-expression] (allout-init t) Setup Emacs session for outline mode - auto-activation. +The bindings are dictated by the customizable `allout-keybindings-list' +variable. We recommend customizing `allout-command-prefix' to use just +`\\C-c' as the command prefix, if the allout bindings don't conflict with +any personal bindings you have on \\C-c. In any case, outline structure +navigation and authoring is simplified by positioning the cursor on an +item's bullet character, the \"hot-spot\" - then you can invoke allout +commands with just the un-prefixed, un-control-shifted command letters. +This is described further in the HOT-SPOT Operation section. + + Exposure Control: + ---------------- +\\[allout-hide-current-subtree] `allout-hide-current-subtree' +\\[allout-show-children] `allout-show-children' +\\[allout-show-current-subtree] `allout-show-current-subtree' +\\[allout-show-current-entry] `allout-show-current-entry' +\\[allout-show-all] `allout-show-all' + + Navigation: + ---------- +\\[allout-next-visible-heading] `allout-next-visible-heading' +\\[allout-previous-visible-heading] `allout-previous-visible-heading' +\\[allout-up-current-level] `allout-up-current-level' +\\[allout-forward-current-level] `allout-forward-current-level' +\\[allout-backward-current-level] `allout-backward-current-level' +\\[allout-end-of-entry] `allout-end-of-entry' +\\[allout-beginning-of-current-entry] `allout-beginning-of-current-entry' (alternately, goes to hot-spot) +\\[allout-beginning-of-line] `allout-beginning-of-line' - like regular beginning-of-line, but + if immediately repeated cycles to the beginning of the current item + and then to the hot-spot (if `allout-beginning-of-line-cycles' is set). + + + Topic Header Production: + ----------------------- +\\[allout-open-sibtopic] `allout-open-sibtopic' Create a new sibling after current topic. +\\[allout-open-subtopic] `allout-open-subtopic' ... an offspring of current topic. +\\[allout-open-supertopic] `allout-open-supertopic' ... a sibling of the current topic's parent. + + Topic Level and Prefix Adjustment: + --------------------------------- +\\[allout-shift-in] `allout-shift-in' Shift current topic and all offspring deeper +\\[allout-shift-out] `allout-shift-out' ... less deep +\\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for + current topic +\\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and + its' offspring - distinctive bullets are not changed, others + are alternated according to nesting depth. +\\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings - + the offspring are not affected. + With repeat count, revoke numbering. + + Topic-oriented Killing and Yanking: + ---------------------------------- +\\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring. +\\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring. +\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure. +\\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it. +\\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to + depth of heading if yanking into bare topic + heading (ie, prefix sans text). +\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank + + Topic-oriented Encryption: + ------------------------- +\\[allout-toggle-current-subtree-encryption] `allout-toggle-current-subtree-encryption' + Encrypt/Decrypt topic content + + Misc commands: + ------------- +M-x outlineify-sticky Activate outline mode for current buffer, + and establish a default file-var setting + for `allout-layout'. +\\[allout-mark-topic] `allout-mark-topic' +\\[allout-copy-exposed-to-buffer] `allout-copy-exposed-to-buffer' + Duplicate outline, sans concealed text, to + buffer with name derived from derived from that + of current buffer - \"*BUFFERNAME exposed*\". +\\[allout-flatten-exposed-to-buffer] `allout-flatten-exposed-to-buffer' + Like above 'copy-exposed', but convert topic + prefixes to section.subsection... numeric + format. +\\[eval-expression] (allout-init t) Setup Emacs session for outline mode + auto-activation. Topic Encryption @@ -1742,17 +1763,22 @@ Outline mode supports gpg encryption of topics, with support for symmetric and key-pair modes, passphrase timeout, passphrase consistency checking, user-provided hinting for symmetric key mode, and auto-encryption of topics pending encryption on save. -\(Topics pending encryption are, by default, automatically -encrypted during file saves; if you're editing the contents of -such a topic, it is automatically decrypted for continued -editing.) The aim is reliable topic privacy while preventing -accidents like neglected encryption before saves, forgetting -which passphrase was used, and other practical pitfalls. -See `allout-toggle-current-subtree-encryption' function docstring and -`allout-encrypt-unencrypted-on-saves' customization variable for details. +Topics pending encryption are, by default, automatically +encrypted during file saves. If the contents of the topic +containing the cursor was encrypted for a save, it is +automatically decrypted for continued editing. + +The aim of these measures is reliable topic privacy while +preventing accidents like neglected encryption before saves, +forgetting which passphrase was used, and other practical +pitfalls. + +See `allout-toggle-current-subtree-encryption' function docstring +and `allout-encrypt-unencrypted-on-saves' customization variable +for details. - HOT-SPOT Operation + HOT-SPOT Operation Hot-spot operation provides a means for easy, single-keystroke outline navigation and exposure control. @@ -1765,85 +1791,108 @@ would invoke the command typically bound to \"C-c<space>C-f\" Thus, by positioning the cursor on a topic bullet, you can execute the outline navigation and manipulation commands with a -single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get +single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) don't get this special translation, so you can use them to get out of the -hot-spot and back to normal operation. +hot-spot and back to normal editing operation. + +In allout-mode, the normal beginning-of-line command (\\[allout-beginning-of-line]]) is +replaced with one that makes it easy to get to the hot-spot. If you +repeat it immediately it cycles (if `allout-beginning-of-line-cycles' +is set) to the beginning of the item and then, if you hit it again +immediately, to the hot-spot. Similarly, `allout-beginning-of-current-entry' +\(\\[allout-beginning-of-current-entry]) moves to the hot-spot when the cursor is already located +at the beginning of the current entry. + + Extending Allout + +Allout exposure and authoring activites all have associated +hooks, by which independent code can cooperate with allout +without changes to the allout core. Here are key ones: -Note that the command `allout-beginning-of-current-entry' \(\\[allout-beginning-of-current-entry]\) -will move to the hot-spot when the cursor is already located at the -beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry] -twice in a row to get to the hot-spot. +`allout-mode-hook' +`allout-mode-deactivate-hook' +`allout-exposure-change-hook' +`allout-structure-added-hook' +`allout-structure-deleted-hook' +`allout-structure-shifted-hook' - Terminology + Terminology Topic hierarchy constituents - TOPICS and SUBTOPICS: -TOPIC: A basic, coherent component of an Emacs outline. It can - contain and be contained by other topics. -CURRENT topic: - The visible topic most immediately containing the cursor. -DEPTH: The degree of nesting of a topic; it increases with - containment. Also called the: -LEVEL: The same as DEPTH. +ITEM: A unitary outline element, including the HEADER and ENTRY text. +TOPIC: An ITEM and any ITEMs contained within it, ie having greater DEPTH + and with no intervening items of lower DEPTH than the container. +CURRENT ITEM: + The visible ITEM most immediately containing the cursor. +DEPTH: The degree of nesting of an ITEM; it increases with containment. + The DEPTH is determined by the HEADER PREFIX. The DEPTH is also + called the: +LEVEL: The same as DEPTH. ANCESTORS: - The topics that contain a topic. -PARENT: A topic's immediate ancestor. It has a depth one less than - the topic. + Those ITEMs whose TOPICs contain an ITEM. +PARENT: An ITEM's immediate ANCESTOR. It has a DEPTH one less than that + of the ITEM. OFFSPRING: - The topics contained by a topic; + The ITEMs contained within an ITEM's TOPIC. SUBTOPIC: - An immediate offspring of a topic; -CHILDREN: - The immediate offspring of a topic. + An OFFSPRING of its ANCESTOR TOPICs. +CHILD: + An immediate SUBTOPIC of its PARENT. SIBLINGS: - Topics having the same parent and depth. + TOPICs having the same PARENT and DEPTH. Topic text constituents: -HEADER: The first line of a topic, include the topic PREFIX and header - text. -PREFIX: The leading text of a topic which distinguishes it from normal - text. It has a strict form, which consists of a prefix-lead - string, padding, and a bullet. The bullet may be followed by a +HEADER: The first line of an ITEM, include the ITEM PREFIX and HEADER + text. +ENTRY: The text content of an ITEM, before any OFFSPRING, but including + the HEADER text and distinct from the ITEM PREFIX. +BODY: Same as ENTRY. +PREFIX: The leading text of an ITEM which distinguishes it from normal + ENTRY text. Allout recognizes the outline structure according + to the strict PREFIX format. It consists of a PREFIX-LEAD string, + PREFIX-PADDING, and a BULLET. The BULLET might be followed by a number, indicating the ordinal number of the topic among its - siblings, a space, and then the header text. + siblings, or an asterisk indicating encryption, plus an optional + space. After that is the ITEM HEADER text, which is not part of + the PREFIX. - The relative length of the PREFIX determines the nesting depth - of the topic. + The relative length of the PREFIX determines the nesting DEPTH + of the ITEM. PREFIX-LEAD: - The string at the beginning of a topic prefix, normally a `.'. - It can be customized by changing the setting of - `allout-header-prefix' and then reinitializing `allout-mode'. - - By setting the prefix-lead to the comment-string of a - programming language, you can embed outline structuring in - program code without interfering with the language processing - of that code. See `allout-use-mode-specific-leader' - docstring for more detail. + The string at the beginning of a HEADER PREFIX, by default a `.'. + It can be customized by changing the setting of + `allout-header-prefix' and then reinitializing `allout-mode'. + + When the PREFIX-LEAD is set to the comment-string of a + programming language, outline structuring can be embedded in + program code without interfering with processing of the text + (by emacs or the language processor) as program code. This + setting happens automatically when allout mode is used in + programming-mode buffers. See `allout-use-mode-specific-leader' + docstring for more detail. PREFIX-PADDING: - Spaces or asterisks which separate the prefix-lead and the - bullet, determining the depth of the topic. -BULLET: A character at the end of the topic prefix, it must be one of - the characters listed on `allout-plain-bullets-string' or + Spaces or asterisks which separate the PREFIX-LEAD and the + bullet, determining the ITEM's DEPTH. +BULLET: A character at the end of the ITEM PREFIX, it must be one of + the characters listed on `allout-plain-bullets-string' or `allout-distinctive-bullets-string'. (See the documentation for these variables for more details.) The default choice of - bullet when generating topics varies in a cycle with the depth of - the topic. -ENTRY: The text contained in a topic before any offspring. -BODY: Same as ENTRY. - + BULLET when generating ITEMs varies in a cycle with the DEPTH of + the ITEM. EXPOSURE: - The state of a topic which determines the on-screen visibility - of its offspring and contained text. + The state of a TOPIC which determines the on-screen visibility + of its OFFSPRING and contained ENTRY text. CONCEALED: - Topics and entry text whose display is inhibited. Contiguous - units of concealed text is represented by `...' ellipses. + TOPICs and ENTRY text whose EXPOSURE is inhibited. Concealed + text is represented by \"...\" ellipses. - Concealed topics are effectively collapsed within an ancestor. -CLOSED: A topic whose immediate offspring and body-text is concealed. -OPEN: A topic that is not closed, though its offspring or body may be." + CONCEALED TOPICs are effectively collapsed within an ANCESTOR. +CLOSED: A TOPIC whose immediate OFFSPRING and body-text is CONCEALED. +OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be." ;;;_ . Code (interactive "P") @@ -1934,22 +1983,8 @@ OPEN: A topic that is not closed, though its offspring or body may be." extend)) ;; Produce map from current version of allout-keybindings-list: - (setq allout-mode-map - (produce-allout-mode-map allout-keybindings-list)) - (substitute-key-definition 'beginning-of-line - 'allout-beginning-of-line - allout-mode-map global-map) - (substitute-key-definition 'move-beginning-of-line - 'allout-beginning-of-line - allout-mode-map global-map) - (substitute-key-definition 'end-of-line - 'allout-end-of-line - allout-mode-map global-map) - (substitute-key-definition 'move-end-of-line - 'allout-end-of-line - allout-mode-map global-map) + (allout-setup-mode-map) (produce-allout-mode-menubar-entries) - (fset 'allout-mode-map allout-mode-map) ;; Include on minor-mode-map-alist, if not already there: (if (not (member '(allout-mode . allout-mode-map) @@ -2039,6 +2074,31 @@ OPEN: A topic that is not closed, though its offspring or body may be." allout-mode ) ; let* ) ; defun + +(defun allout-setup-mode-map () + "Establish allout-mode bindings." + (setq-default allout-mode-map + (produce-allout-mode-map allout-keybindings-list)) + (setq allout-mode-map + (produce-allout-mode-map allout-keybindings-list)) + (substitute-key-definition 'beginning-of-line + 'allout-beginning-of-line + allout-mode-map global-map) + (substitute-key-definition 'move-beginning-of-line + 'allout-beginning-of-line + allout-mode-map global-map) + (substitute-key-definition 'end-of-line + 'allout-end-of-line + allout-mode-map global-map) + (substitute-key-definition 'move-end-of-line + 'allout-end-of-line + allout-mode-map global-map) + (fset 'allout-mode-map allout-mode-map)) + +;; ensure that allout-mode-map has some setting even if allout-mode hasn't +;; been invoked: +(allout-setup-mode-map) + ;;;_ > allout-minor-mode (defalias 'allout-minor-mode 'allout-mode) @@ -2453,7 +2513,7 @@ Outermost is first." (t (allout-end-of-entry)))))) ;;;_ > allout-next-heading () (defsubst allout-next-heading () - "Move to the heading for the topic \(possibly invisible) after this one. + "Move to the heading for the topic (possibly invisible) after this one. Returns the location of the heading, or nil if none found. @@ -2476,7 +2536,7 @@ We skip anomolous low-level topics, a la `allout-aberrant-container-p'." (if (not (allout-goto-prefix-doublechecked)) (allout-next-heading))) ;;;_ > allout-previous-heading () (defun allout-previous-heading () - "Move to the prior \(possibly invisible) heading line. + "Move to the prior (possibly invisible) heading line. Return the location of the beginning of the heading, or nil if not found. @@ -2526,7 +2586,7 @@ We skip anomolous low-level topics, a la `allout-aberrant-container-p'." (defun allout-chart-subtree (&optional levels visible orig-depth prev-depth) "Produce a location \"chart\" of subtopics of the containing topic. -Optional argument LEVELS specifies a depth limit \(relative to start +Optional argument LEVELS specifies a depth limit (relative to start depth) for the chart. Null LEVELS means no limit. When optional argument VISIBLE is non-nil, the chart includes @@ -2663,7 +2723,7 @@ start point." result)) ;;;_ X allout-chart-spec (chart spec &optional exposing) ;; (defun allout-chart-spec (chart spec &optional exposing) -;; "Not yet \(if ever) implemented. +;; "Not yet (if ever) implemented. ;; Produce exposure directives given topic/subtree CHART and an exposure SPEC. @@ -2684,7 +2744,7 @@ start point." ;; - bare positive values indicate that this topic header should be ;; opened. ;; - Lists signify the beginning and end points of regions that should -;; be flagged, and the flag to employ. (For concealment: `\(\?r\)', and +;; be flagged, and the flag to employ. (For concealment: `(\?r)', and ;; exposure:" ;; (while spec ;; (cond ((listp spec) @@ -2721,7 +2781,7 @@ Returns the point at the beginning of the prefix, or nil if none." (defun allout-goto-prefix-doublechecked () "Put point at beginning of immediately containing outline topic. -Like `allout-goto-prefix', but shallow topics \(according to +Like `allout-goto-prefix', but shallow topics (according to `allout-doublecheck-at-and-shallower') are checked and disqualified for child containment discontinuity, according to `allout-aberrant-container-p'." @@ -2749,7 +2809,7 @@ otherwise skip white space between bullet and ensuing text." (allout-current-depth))) ;;;_ > allout-current-bullet-pos () (defun allout-current-bullet-pos () - "Return position of current \(visible) topic's bullet." + "Return position of current (visible) topic's bullet." (if (not (allout-current-depth)) nil @@ -2887,19 +2947,31 @@ collapsed." (if (interactive-p) (allout-end-of-prefix)) (and last-ascended allout-recent-depth)))) ;;;_ > allout-ascend () -(defun allout-ascend () - "Ascend one level, returning t if successful, nil if not." +(defun allout-ascend (&optional dont-move-if-unsuccessful) + "Ascend one level, returning resulting depth if successful, nil if not. + +Point is left at the beginning of the level whether or not +successful, unless optional DONT-MOVE-IF-UNSUCCESSFUL is set, in +which case point is returned to its original starting location." + (if dont-move-if-unsuccessful + (setq dont-move-if-unsuccessful (point))) (prog1 (if (allout-beginning-of-level) (let ((bolevel (point)) (bolevel-depth allout-recent-depth)) (allout-previous-heading) - (if (< allout-recent-depth bolevel-depth) - allout-recent-depth - ;; some topic after file's first is at lower depth than first: - (goto-char bolevel) - (allout-depth) - nil))) + (cond ((< allout-recent-depth bolevel-depth) + allout-recent-depth) + ((= allout-recent-depth bolevel-depth) + (if dont-move-if-unsuccessful + (goto-char dont-move-if-unsuccessful)) + (allout-depth) + nil) + (t + ;; some topic after very first is lower depth than first: + (goto-char bolevel) + (allout-depth) + nil)))) (if (interactive-p) (allout-end-of-prefix)))) ;;;_ > allout-descend-to-depth (depth) (defun allout-descend-to-depth (depth) @@ -2990,7 +3062,7 @@ Return the start point of the new topic if successful, nil otherwise. Costs more than regular `allout-next-sibling' for short traversals: - - we have to check the prior \(next, if travelling backwards) + - we have to check the prior (next, if travelling backwards) item to confirm connectivity with the prior topic, and - if confirmed, we have to reestablish the allout-recent-* settings with some extra navigation @@ -3219,7 +3291,7 @@ reinterpreted as the corresponding control-character in the the cursor which has moved as a result of such reinterpretation is positioned on the bullet character of the destination topic. -The upshot is that you can get easy, single \(ie, unmodified\) key +The upshot is that you can get easy, single (ie, unmodified) key outline maneuvering operations by positioning the cursor on the bullet char. When in this mode you can use regular cursor-positioning command/keystrokes to relocate the cursor off of a bullet character to @@ -3329,7 +3401,7 @@ Offer one suitable for current depth DEPTH as default." (allout-get-bullet))))) ;;;_ > allout-encrypted-type-prefix (&optional prefix) (defun allout-encrypted-type-prefix (&optional prefix) - "True if current header prefix bullet is for an encrypted entry \(body)." + "True if current header prefix bullet is for an encrypted entry (body)." (and allout-topic-encryption-bullet (string= allout-topic-encryption-bullet (if prefix @@ -3380,8 +3452,8 @@ the current topics' depth. If SOLICIT is non-nil, then the choice of bullet is solicited from user. If it's a character, then that character is offered as the -default, otherwise the one suited to the context \(according to -distinction or depth) is offered. \(This overrides other options, +default, otherwise the one suited to the context (according to +distinction or depth) is offered. (This overrides other options, including, eg, a distinctive PRIOR-BULLET.) If non-nil, then the context-specific bullet is used. @@ -3505,7 +3577,7 @@ whitespace - in which case open is done on the current line. When adding an offspring, it will be added immediately after the parent if the other offspring are exposed, or after the last child if the offspring -are hidden. \(The intervening offspring will be exposed in the latter +are hidden. (The intervening offspring will be exposed in the latter case.) If OFFER-RECENT-BULLET is true, offer to use the bullet of the prior sibling. @@ -3823,7 +3895,7 @@ All args are optional. If SOLICIT is non-nil, then the choice of bullet is solicited from user. If it's a character, then that character is offered as the -default, otherwise the one suited to the context \(according to +default, otherwise the one suited to the context (according to distinction or depth) is offered. If non-nil, then the context-specific bullet is just used. @@ -3921,7 +3993,7 @@ this function." Descends into invisible as well as visible topics, however. When optional sans-offspring is non-nil, subtopics are not -shifted. \(Shifting a topic outwards without shifting its +shifted. (Shifting a topic outwards without shifting its offspring is disallowed, since this would create a \"containment discontinuity\", where the depth difference between a topic and its immediate offspring is greater than one.) @@ -3962,7 +4034,7 @@ Several subsequent args are for internal recursive use by the function itself: STARTING-DEPTH, STARTING-POINT, and INDEX. Finally, if optional SANS-OFFSPRING is non-nil then the offspring -are not shifted. \(Shifting a topic outwards without shifting +are not shifted. (Shifting a topic outwards without shifting its offspring is disallowed, since this would create a \"containment discontinuity\", where the depth difference between a topic and its immediate offspring is greater than one..)" @@ -4445,7 +4517,7 @@ however, are left exactly like normal, non-allout-specific yanks." (while more (allout-back-to-current-heading) ; go as high as we can in each bunch: - (while (allout-ascend)) + (while (allout-ascend t)) (save-excursion (allout-unprotected (allout-rebullet-topic-grunt (- adjust-to-depth @@ -4598,9 +4670,9 @@ by pops to non-distinctive yanks. Bug..." "Conceal text between FROM and TO if FLAG is non-nil, else reveal it. Exposure-change hook `allout-exposure-change-hook' is run with the same -arguments as this function, after the exposure changes are made. \(The old +arguments as this function, after the exposure changes are made. (The old `allout-view-change-hook' is being deprecated, and eventually will not be -invoked.\)" +invoked.)" ;; We use outline invisibility spec. (remove-overlays from to 'category 'allout-exposure-category) @@ -4900,7 +4972,7 @@ SPEC is either a number or a list. Successive specs on a list are applied to successive sibling topics. -A simple spec \(either a number, one of a few symbols, or the null +A simple spec (either a number, one of a few symbols, or the null list) dictates the exposure for the corresponding topic. Non-null lists recursively designate exposure specs for respective @@ -4923,7 +4995,7 @@ Simple (numeric and null-list) specs are interpreted as follows: apply prior element to all siblings at current level, *up to* those siblings that would be covered by specs following the `:' on the list. Ie, apply to all topics at level but the last - ones. \(Only first of multiple colons at same level is + ones. (Only first of multiple colons at same level is respected - subsequent ones are discarded.) * - completely opens the topic, including bodies. + - shows all the sub headers, but not the bodies @@ -5006,7 +5078,7 @@ Examples: ;;;_ > allout-old-expose-topic (spec &rest followers) (defun allout-old-expose-topic (spec &rest followers) - "Deprecated. Use `allout-expose-topic' \(with different schema + "Deprecated. Use `allout-expose-topic' (with different schema format) instead. Dictate wholesale exposure scheme for current topic, according to SPEC. @@ -5203,7 +5275,7 @@ the prefix: list - Present prefix as numeric section.subsection..., starting with section indicated by the list, innermost nesting first. - `indent' \(symbol) - Convert header prefixes to all white space, + `indent' (symbol) - Convert header prefixes to all white space, except for distinctive bullets. The elements of the list produced are lists that represents a topic @@ -5332,7 +5404,7 @@ alternate presentation form: X`flat-indented' - Prefix is like `flat' for first topic at each X level, but subsequent topics have only leaf topic X number, padded with blanks to line up with first. - `indent' \(symbol) - Convert header prefixes to all white space, + `indent' (symbol) - Convert header prefixes to all white space, except for distinctive bullets. Defaults: @@ -5484,7 +5556,7 @@ used verbatim." ;;;_ > allout-latex-verb-quote (string &optional flow) (defun allout-latex-verb-quote (string &optional flow) "Return copy of STRING for literal reproduction across LaTeX processing. -Expresses the original characters \(including carriage returns) of the +Expresses the original characters (including carriage returns) of the string across LaTeX processing." (mapconcat (function (lambda (char) @@ -5496,9 +5568,9 @@ string across LaTeX processing." "")) ;;;_ > allout-latex-verbatim-quote-curr-line () (defun allout-latex-verbatim-quote-curr-line () - "Express line for exact \(literal) representation across LaTeX processing. + "Express line for exact (literal) representation across LaTeX processing. -Adjust line contents so it is unaltered \(from the original line) +Adjust line contents so it is unaltered (from the original line) across LaTeX processing, within the context of a `verbatim' environment. Leaves point at the end of the line." (let ((inhibit-field-text-motion t)) @@ -5673,29 +5745,29 @@ With repeat count, copy the exposed portions of entire buffer." "Encrypt clear or decrypt encoded text of visibly-containing topic's contents. Optional FETCH-PASS universal argument provokes key-pair encryption with -single universal argument. With doubled universal argument \(value = 16), +single universal argument. With doubled universal argument (value = 16), it forces prompting for the passphrase regardless of availability from the passphrase cache. With no universal argument, the appropriate passphrase is obtained from the cache, if available, else from the user. -Currently only GnuPG encryption is supported. +Only GnuPG encryption is supported. -\**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg +\*NOTE WELL* that the encrypted text must be ascii-armored. For gnupg encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. Both symmetric-key and key-pair encryption is implemented. Symmetric is -the default, use a single \(x4) universal argument for keypair mode. +the default, use a single (x4) universal argument for keypair mode. Encrypted topic's bullet is set to a `~' to signal that the contents of the -topic \(body and subtopics, but not heading) is pending encryption or +topic (body and subtopics, but not heading) is pending encryption or encrypted. `*' asterisk immediately after the bullet signals that the body is encrypted, its' absence means the topic is meant to be encrypted but is not. When a file with topics pending encryption is saved, topics pending encryption are encrypted. See allout-encrypt-unencrypted-on-saves for auto-encryption specifics. -\**NOTE WELL** that automatic encryption that happens during saves will -default to symmetric encryption - you must manually \(re)encrypt key-pair +\*NOTE WELL* that automatic encryption that happens during saves will +default to symmetric encryption - you must deliberately (re)encrypt key-pair encrypted topics if you want them to continue to use the key-pair cipher. Level-one topics, with prefix consisting solely of an `*' asterisk, cannot be @@ -5707,10 +5779,8 @@ encrypted. If you want to encrypt the contents of a top-level topic, use The encryption passphrase is solicited if not currently available in the passphrase cache from a recent encryption action. -The solicited passphrase is retained for reuse in a buffer-specific cache -for some set period of time \(default, 60 seconds), after which the string -is nulled. The passphrase cache timeout is customized by setting -`pgg-passphrase-cache-expiry'. +The solicited passphrase is retained for reuse in a cache, if enabled. See +`pgg-cache-passphrase' and `pgg-passphrase-cache-expiry' for details. Symmetric Passphrase Hinting and Verification @@ -5731,7 +5801,7 @@ verifier across Emacs sessions. Similarly, `allout-passphrase-hint-string' stores a user-provided reminder about their passphrase, and `allout-passphrase-hint-handling' specifies when the hint is presented, or if passphrase hints are disabled. If -enabled \(see the `allout-passphrase-hint-handling' docstring for details), +enabled (see the `allout-passphrase-hint-handling' docstring for details), the hint string is stored in the local-variables section of the file, and solicited whenever the passphrase is changed." (interactive "P") @@ -5742,15 +5812,16 @@ solicited whenever the passphrase is changed." ) ;;;_ > allout-toggle-subtree-encryption (&optional fetch-pass) (defun allout-toggle-subtree-encryption (&optional fetch-pass) - "Encrypt clear text or decrypt encoded topic contents \(body and subtopics.) + "Encrypt clear text or decrypt encoded topic contents (body and subtopics.) Optional FETCH-PASS universal argument provokes key-pair encryption with -single universal argument. With doubled universal argument \(value = 16), +single universal argument. With doubled universal argument (value = 16), it forces prompting for the passphrase regardless of availability from the passphrase cache. With no universal argument, the appropriate passphrase is obtained from the cache, if available, else from the user. -Currently only GnuPG encryption is supported. +Currently only GnuPG encryption is supported, and integration +with gpg-agent is not yet implemented. \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. @@ -5926,7 +5997,11 @@ Returns the resulting string, or nil if the transformation fails." (rejected (or rejected 0)) (rejections-left (- allout-encryption-ciphertext-rejection-ceiling rejected)) - result-text status) + result-text status + ;; Inhibit gpg-agent use for symmetric keys in the scope of this let: + (pgg-gpg-use-agent (if (equal key-type 'keypair) + pgg-gpg-use-agent + nil))) (if (and fetch-pass (not passphrase)) ;; Force later fetch by evicting passphrase from the cache. @@ -5934,12 +6009,9 @@ Returns the resulting string, or nil if the transformation fails." (catch 'encryption-failed - ;; Obtain the passphrase if we don't already have one and we're not - ;; doing a keypair encryption: - (if (not (or passphrase - (and (equal key-type 'keypair) - (not decrypt)))) - + ;; We handle only symmetric-key passphrase caching. + (if (and (not passphrase) + (not (equal key-type 'keypair))) (setq passphrase (allout-obtain-passphrase for-key target-cache-id target-prompt-id @@ -6489,7 +6561,7 @@ This activity is inhibited if either `enable-local-variables' When enabled, an entry for the variable is created if not already present, or changed if established with a different value. The section for the file variables, itself, is created if not already present. When created, the -section lines \(including the section line) exist as second-level topics in +section lines (including the section line) exist as second-level topics in a top-level topic at the end of the file. `enable-local-variables' must be true for any of this to happen." @@ -6818,7 +6890,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t." ;;;_ #10 Unfinished ;;;_ > allout-bullet-isearch (&optional bullet) (defun allout-bullet-isearch (&optional bullet) - "Isearch \(regexp) for topic with bullet BULLET." + "Isearch (regexp) for topic with bullet BULLET." (interactive) (if (not bullet) (setq bullet (solicit-char-in-string diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 4afdfac2bf5..dc623e26796 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1,6 +1,6 @@ ;;; arc-mode.el --- simple editing of archives -;; Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1995, 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@gnu.org> diff --git a/lisp/array.el b/lisp/array.el index fb9e7301206..6ebbd645520 100644 --- a/lisp/array.el +++ b/lisp/array.el @@ -1,6 +1,6 @@ ;;; array.el --- array editing commands for GNU Emacs -;; Copyright (C) 1987, 2000, 2002, 2003, 2004, +;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author David M. Brown diff --git a/lisp/autoarg.el b/lisp/autoarg.el index 8d94ae547af..16dea6d2264 100644 --- a/lisp/autoarg.el +++ b/lisp/autoarg.el @@ -1,6 +1,6 @@ ;;; autoarg.el --- make digit keys supply prefix args -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index 15a7461d288..4df0b39b83e 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -1,7 +1,7 @@ ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files -;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2002, 2003, -;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Charlie Martin <crm@cs.duke.edu> ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/avoid.el b/lisp/avoid.el index b497c2007bd..f493392c4b0 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el @@ -1,6 +1,6 @@ ;;; avoid.el --- make mouse pointer stay out of the way of editing -;; Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> diff --git a/lisp/bindings.el b/lisp/bindings.el index 755d7fee65b..1d64612d8ca 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1072,6 +1072,10 @@ language you are using." (define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window) +;; Signal handlers +(define-key special-event-map [sigusr1] 'ignore) +(define-key special-event-map [sigusr2] 'ignore) + ;; Don't look for autoload cookies in this file. ;; Local Variables: ;; no-update-autoloads: t diff --git a/lisp/bs.el b/lisp/bs.el index d0b929b2d85..a42b22e8436 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -999,7 +999,6 @@ Uses function `vc-toggle-read-only'." (defun bs--up () "Move cursor vertically up one line. If on top of buffer list go to last line." - (interactive "p") (if (> (count-lines 1 (point)) bs-header-lines-length) (forward-line -1) (goto-char (point-max)) diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index fe5bf4cf9e0..af1113dca76 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -232,9 +232,9 @@ (defvar calc-eval-error nil "Determines how calc handles errors. -NIL means return a list containing the character position of error. +If nil, return a list containing the character position of error. STRING means return error message as string rather than list. -T means abort and give an error message.") +The value t means abort and give an error message.") (defun calc-eval-error (msg) (if calc-eval-error @@ -700,10 +700,10 @@ in Calc algebraic input.") (math-read-token)))))) ((or (and (>= ch ?0) (<= ch ?9)) (and (eq ch '?\.) - (eq (string-match "\\.[0-9]" math-exp-str math-exp-pos) + (eq (string-match "\\.[0-9]" math-exp-str math-exp-pos) math-exp-pos)) (and (eq ch '?_) - (eq (string-match "_\\.?[0-9]" math-exp-str math-exp-pos) + (eq (string-match "_\\.?[0-9]" math-exp-str math-exp-pos) math-exp-pos) (or (eq math-exp-pos 0) (and (memq calc-language '(nil flat big unform @@ -713,7 +713,7 @@ in Calc algebraic input.") (1- math-exp-pos)))))) (or (and (eq calc-language 'c) (string-match "0[xX][0-9a-fA-F]+" math-exp-str math-exp-pos)) - (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?" + (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?" math-exp-str math-exp-pos)) (setq math-exp-token 'number math-expr-data (math-match-substring math-exp-str 0) @@ -751,7 +751,7 @@ in Calc algebraic input.") math-expr-data (math-match-substring math-exp-str 0) math-exp-pos (match-end 0))) ((and (eq ch ?\") - (string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)" + (string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)" math-exp-str math-exp-pos)) (if (eq calc-language 'eqn) (progn @@ -765,9 +765,9 @@ in Calc algebraic input.") math-exp-pos (match-end 0)))) ((and (= ch ?\\) (eq calc-language 'tex) (< math-exp-pos (1- (length math-exp-str)))) - (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" + (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" math-exp-str math-exp-pos) - (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" + (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" math-exp-str math-exp-pos)) (setq math-exp-token 'symbol math-exp-pos (match-end 0) @@ -791,11 +791,11 @@ in Calc algebraic input.") (aset math-exp-str right ?\]))))))) ((and (= ch ?\\) (eq calc-language 'latex) (< math-exp-pos (1- (length math-exp-str)))) - (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" + (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" math-exp-str math-exp-pos) - (string-match "\\\\text *{\\([a-zA-Z0-9]+\\)}" + (string-match "\\\\text *{\\([a-zA-Z0-9]+\\)}" math-exp-str math-exp-pos) - (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" + (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" math-exp-str math-exp-pos)) (setq math-exp-token 'symbol math-exp-pos (match-end 0) @@ -821,7 +821,7 @@ in Calc algebraic input.") (string= envname "pmatrix")) (if (string-match (concat "\\\\end{" envname "}") math-exp-str math-exp-pos) - (setq math-exp-str + (setq math-exp-str (replace-match "]" t t math-exp-str)) (error "%s" (concat "No closing \\end{" envname "}")))))) ((and (eq (nth 1 code) 'mat) @@ -852,7 +852,7 @@ in Calc algebraic input.") (setq math-exp-token 'punc math-expr-data (math-match-substring math-exp-str 0) math-exp-pos (match-end 0)) - (and (eq (string-match "\\\\dots\\." math-exp-str math-exp-pos) + (and (eq (string-match "\\\\dots\\." math-exp-str math-exp-pos) math-exp-pos) (setq math-exp-pos (match-end 0))) (if (memq (aref math-expr-data 0) '(?~ ?^)) diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index aed4c32e3db..ddd317de106 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el @@ -53,7 +53,8 @@ change." :group 'calendar) (defvar calendar-current-time-zone-cache nil - "Cache for result of calendar-current-time-zone.") + "Cache for result of `calendar-current-time-zone'.") +(put 'calendar-current-time-zone-cache 'risky-local-variable t) (defvar calendar-system-time-basis (calendar-absolute-from-gregorian '(1 1 1970)) @@ -345,8 +346,9 @@ This function respects the value of `calendar-dst-check-each-year-flag'." (cadr (calendar-dst-find-startend year)) (nth 4 calendar-current-time-zone-cache)))) (if expr (eval expr))) + ;; New US rules commencing 2007. ftp://elsie.nci.nih.gov/pub/. (and (not (zerop calendar-daylight-time-offset)) - (calendar-nth-named-day 1 0 4 year)))) + (calendar-nth-named-day 2 0 3 year)))) (defun calendar-dst-ends (year) "Return the date of YEAR on which Daylight Saving Time ends. @@ -355,8 +357,9 @@ This function respects the value of `calendar-dst-check-each-year-flag'." (nth 2 (calendar-dst-find-startend year)) (nth 5 calendar-current-time-zone-cache)))) (if expr (eval expr))) + ;; New US rules commencing 2007. ftp://elsie.nci.nih.gov/pub/. (and (not (zerop calendar-daylight-time-offset)) - (calendar-nth-named-day -1 0 10 year)))) + (calendar-nth-named-day 1 0 11 year)))) ;;;###autoload diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index c5e7f85f51b..c0249223a06 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -2199,12 +2199,12 @@ movement commands will not work correctly." downcase-region upcase-region kill-region copy-region-as-kill capitalize-region write-region)) (define-key map (vector 'remap c) 'calendar-not-implemented)) - (define-key map ">" 'scroll-calendar-right) - (define-key map "\C-x>" 'scroll-calendar-right) + (define-key map "<" 'scroll-calendar-right) + (define-key map "\C-x<" 'scroll-calendar-right) (define-key map [prior] 'scroll-calendar-right-three-months) (define-key map "\ev" 'scroll-calendar-right-three-months) - (define-key map "<" 'scroll-calendar-left) - (define-key map "\C-x<" 'scroll-calendar-left) + (define-key map ">" 'scroll-calendar-left) + (define-key map "\C-x>" 'scroll-calendar-left) (define-key map [next] 'scroll-calendar-left-three-months) (define-key map "\C-v" 'scroll-calendar-left-three-months) (define-key map "\C-b" 'calendar-backward-day) @@ -2337,42 +2337,40 @@ movement commands will not work correctly." (defvar calendar-mode-line-format (list - (propertize (substitute-command-keys - "\\<calendar-mode-map>\\[scroll-calendar-left]") - 'help-echo "mouse-2: scroll left" + (propertize "<" + 'help-echo "mouse-1: previous month" 'mouse-face 'mode-line-highlight - 'keymap (make-mode-line-mouse-map 'mouse-2 - 'mouse-scroll-calendar-left)) + 'keymap (make-mode-line-mouse-map 'mouse-1 + 'mouse-scroll-calendar-right)) "Calendar" (concat (propertize (substitute-command-keys "\\<calendar-mode-map>\\[calendar-goto-info-node] info") - 'help-echo "mouse-2: read Info on Calendar" + 'help-echo "mouse-1: read Info on Calendar" 'mouse-face 'mode-line-highlight - 'keymap (make-mode-line-mouse-map 'mouse-2 'calendar-goto-info-node)) - "/" + 'keymap (make-mode-line-mouse-map 'mouse-1 'calendar-goto-info-node)) + " / " (propertize (substitute-command-keys - "\\<calendar-mode-map>\\[calendar-other-month] other") - 'help-echo "mouse-2: choose another month" + " \\<calendar-mode-map>\\[calendar-other-month] other") + 'help-echo "mouse-1: choose another month" 'mouse-face 'mode-line-highlight 'keymap (make-mode-line-mouse-map - 'mouse-2 'mouse-calendar-other-month)) - "/" + 'mouse-1 'mouse-calendar-other-month)) + " / " (propertize (substitute-command-keys "\\<calendar-mode-map>\\[calendar-goto-today] today") - 'help-echo "mouse-2: go to today's date" + 'help-echo "mouse-1: go to today's date" 'mouse-face 'mode-line-highlight - 'keymap (make-mode-line-mouse-map 'mouse-2 #'calendar-goto-today))) + 'keymap (make-mode-line-mouse-map 'mouse-1 #'calendar-goto-today))) '(calendar-date-string (calendar-current-date) t) - (propertize (substitute-command-keys - "\\<calendar-mode-map>\\[scroll-calendar-right]") - 'help-echo "mouse-2: scroll right" + (propertize ">" + 'help-echo "mouse-1: next month" 'mouse-face 'mode-line-highlight 'keymap (make-mode-line-mouse-map - 'mouse-2 'mouse-scroll-calendar-right))) + 'mouse-1 'mouse-scroll-calendar-left))) "The mode line of the calendar buffer. This must be a list of items that evaluate to strings--those strings are diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 570fb626747..6fecc86bf34 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -73,6 +73,10 @@ ;; * Import from ical to diary: ;; + Need more properties for icalendar-import-format +;; (added all that Mozilla Calendar uses) +;; From iCal specifications (RFC2445: 4.8.1), icalendar.el lacks +;; ATTACH, CATEGORIES, COMMENT, GEO, PERCENT-COMPLETE (VTODO), +;; PRIORITY, RESOURCES) not considering date/time and time-zone ;; + check vcalendar version ;; + check (unknown) elements ;; + recurring events! @@ -97,7 +101,7 @@ ;;; Code: -(defconst icalendar-version "0.13" +(defconst icalendar-version "0.14" "Version number of icalendar.el.") ;; ====================================================================== @@ -226,12 +230,12 @@ buffer." "Replace regular expression in string. Pass ARGS to `replace-regexp-in-string' (Emacs) or to `replace-in-string' (XEmacs)." + (if (fboundp 'replace-regexp-in-string) + ;; Emacs: + (apply 'replace-regexp-in-string args) ;; XEmacs: - (if (fboundp 'replace-in-string) - (save-match-data ;; apparently XEmacs needs save-match-data - (apply 'replace-in-string args)) - ;; Emacs: - (apply 'replace-regexp-in-string args))) + (save-match-data ;; apparently XEmacs needs save-match-data + (apply 'replace-in-string args)))) (defun icalendar--read-element (invalue inparams) "Recursively read the next iCalendar element in the current buffer. @@ -1549,7 +1553,7 @@ buffer `*icalendar-errors*'." (defun icalendar--convert-ical-to-diary (ical-list diary-file &optional do-not-ask non-marking) - "Convert Calendar data to an Emacs diary file. + "Convert iCalendar data to an Emacs diary file. Import VEVENTS from the iCalendar object ICAL-LIST and saves them to a DIARY-FILE. If DO-NOT-ASK is nil the user is asked for each event whether to actually import it. NON-MARKING determines whether diary @@ -1680,6 +1684,13 @@ written into the buffer `*icalendar-errors*'." (setq error-string (format "%s\n%s\nCannot handle this event: %s" error-val error-string e)) (message "%s" error-string)))) + ;; insert final newline + (let ((b (find-buffer-visiting diary-file))) + (when b + (save-current-buffer + (set-buffer b) + (goto-char (point-max)) + (insert "\n")))) (if found-error (save-current-buffer (set-buffer (get-buffer-create "*icalendar-errors*")) diff --git a/lisp/case-table.el b/lisp/case-table.el index a69ed329cb1..d4961bd50cf 100644 --- a/lisp/case-table.el +++ b/lisp/case-table.el @@ -1,6 +1,6 @@ ;;; case-table.el --- code to extend the character set and support case tables -;; Copyright (C) 1988, 1994, 2002, 2003, 2004, +;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle diff --git a/lisp/cdl.el b/lisp/cdl.el index 378bc993aed..4724c2f7ecc 100644 --- a/lisp/cdl.el +++ b/lisp/cdl.el @@ -1,6 +1,6 @@ ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi) diff --git a/lisp/chistory.el b/lisp/chistory.el index 3fbc068ac86..d2578c53c2d 100644 --- a/lisp/chistory.el +++ b/lisp/chistory.el @@ -1,6 +1,6 @@ ;;; chistory.el --- list command history -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 622612648f3..d2a7217a1dc 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -1,6 +1,6 @@ ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el -;; Copyright (C) 1988, 1994, 1997, 2002, 2003, 2004, +;; Copyright (C) 1988, 1994, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu> @@ -244,7 +244,8 @@ Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters." If there is a process already running in `*scheme*', switch to that buffer. With argument, allows you to edit the command line (default is value of `scheme-program-name'). -If a file `~/.emacs_SCHEMENAME' exists, it is given as initial input. +If the file `~/.emacs_SCHEMENAME' or `~/.emacs.d/init_SCHEMENAME.scm' exists, +it is given as initial input. Note that this may lose due to a timing error if the Scheme processor discards input when it starts up. Runs the hook `inferior-scheme-mode-hook' \(after the `comint-mode-hook' @@ -268,12 +269,12 @@ is run). "Return the name of the start file corresponding to PROG. Search in the directories \"~\" and \"~/.emacs.d\", in this order. Return nil if no start file found." - (let* ((name (concat ".emacs_" (file-name-nondirectory prog))) - (start-file (concat "~/" name))) + (let* ((progname (file-name-nondirectory prog)) + (start-file (concat "~/.emacs_" progname)) + (alt-start-file (concat "~/.emacs.d/init_" progname ".scm"))) (if (file-exists-p start-file) start-file - (let ((start-file (concat "~/.emacs.d/" name))) - (and (file-exists-p start-file) start-file))))) + (and (file-exists-p alt-start-file) alt-start-file)))) (defun scheme-send-region (start end) "Send the current region to the inferior Scheme process." diff --git a/lisp/comint.el b/lisp/comint.el index 191807af847..1ab285c9af4 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -132,7 +132,7 @@ ;; comint-eol-on-send boolean ... ;; comint-process-echoes boolean ... ;; comint-scroll-to-bottom-on-input symbol For scroll behavior -;; comint-scroll-to-bottom-on-output symbol ... +;; comint-move-point-for-output symbol ... ;; comint-scroll-show-maximum-output boolean ... ;; comint-accum-marker maker For comint-accumulate ;; @@ -804,8 +804,6 @@ buffer. The hook `comint-exec-hook' is run after each exec." (defun comint-insert-input (event) "In a Comint buffer, set the current input to the previous input at point." - ;; This doesn't use "e" because it is supposed to work - ;; for events without parameters. (interactive "e") (mouse-set-point event) (let ((pos (point))) diff --git a/lisp/compare-w.el b/lisp/compare-w.el index 8dc0ac1e330..4aeb20b1091 100644 --- a/lisp/compare-w.el +++ b/lisp/compare-w.el @@ -1,6 +1,6 @@ ;;; compare-w.el --- compare text between windows for Emacs -;; Copyright (C) 1986, 1989, 1993, 1997, 2002, 2003, 2004, +;; Copyright (C) 1986, 1989, 1993, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/complete.el b/lisp/complete.el index 90c1ceceb32..9083482d8fc 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -1,7 +1,7 @@ ;;; complete.el --- partial completion mechanism plus other goodies -;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Keywords: abbrev convenience diff --git a/lisp/completion.el b/lisp/completion.el index 53dfd7521a5..8d49944e19c 100644 --- a/lisp/completion.el +++ b/lisp/completion.el @@ -1,6 +1,6 @@ ;;; completion.el --- dynamic word-completion code -;; Copyright (C) 1990, 1993, 1995, 1997, 2002, 2003, 2004, +;; Copyright (C) 1990, 1993, 1995, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/composite.el b/lisp/composite.el index a1c84e7b22a..181e1fd6f46 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -1,6 +1,6 @@ ;;; composite.el --- support character composition -;; Copyright (C) 1999, 2000 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index b9b1a6040c9..6b455c7cf70 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el @@ -1,6 +1,6 @@ ;;; cus-dep.el --- find customization dependencies ;; -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index d698aaeecc3..59026942281 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -679,8 +679,9 @@ if that fails, the doc string with `custom-guess-doc-alist'." ;;; Sorting. +;;;###autoload (defcustom custom-browse-sort-alphabetically nil - "If non-nil, sort members of each customization group alphabetically." + "If non-nil, sort customization group alphabetically in `custom-browse'." :type 'boolean :group 'custom-browse) @@ -698,8 +699,9 @@ If `last', order groups after non-groups." :type 'boolean :group 'custom-browse) +;;;###autoload (defcustom custom-buffer-sort-alphabetically nil - "If non-nil, sort members of each customization group alphabetically." + "If non-nil, sort each customization group alphabetically in Custom buffer." :type 'boolean :group 'custom-buffer) @@ -712,8 +714,9 @@ If `last', order groups after non-groups." (const :tag "none" nil)) :group 'custom-buffer) +;;;###autoload (defcustom custom-menu-sort-alphabetically nil - "If non-nil, sort members of each customization group alphabetically." + "If non-nil, sort each customization group alphabetically in menus." :type 'boolean :group 'custom-menu) diff --git a/lisp/custom.el b/lisp/custom.el index e69e233614a..699d432fb70 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -536,6 +536,7 @@ For other custom types, this has no effect." (let ((options (get symbol 'custom-options))) (unless (member option options) (put symbol 'custom-options (cons option options))))) +(defalias 'custom-add-frequent-value 'custom-add-option) (defun custom-add-link (symbol widget) "To the custom option SYMBOL add the link WIDGET." diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el index 477914293a7..7d4f687e053 100644 --- a/lisp/cvs-status.el +++ b/lisp/cvs-status.el @@ -1,6 +1,6 @@ ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*- -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/delim-col.el b/lisp/delim-col.el index b89e979ff0b..ff6c6337eb0 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -1,11 +1,10 @@ ;;; delim-col.el --- prettify all columns in a region or rectangle -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2006/09/15 17:35:06 vinicius> ;; Version: 2.1 ;; Keywords: internal ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 8fb28930fbf..361c3b8c15c 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -212,11 +212,10 @@ The list is null if CHAR isn't found in `describe-char-unicodedata-file'." (when describe-char-unicodedata-file (unless (file-exists-p describe-char-unicodedata-file) (error "`unicodedata-file' %s not found" describe-char-unicodedata-file)) - (with-current-buffer - ;; Find file in fundamental mode to avoid, e.g. flyspell turned - ;; on for .txt. Don't use RAWFILE arg in case of DOS line endings. - (let ((auto-mode-alist)) - (find-file-noselect describe-char-unicodedata-file)) + (with-current-buffer (get-buffer-create " *Unicode Data*") + (when (zerop (buffer-size)) + ;; Don't use -literally in case of DOS line endings. + (insert-file-contents describe-char-unicodedata-file)) (goto-char (point-min)) (let ((hex (format "%04X" char)) found first last) diff --git a/lisp/dired.el b/lisp/dired.el index 5359b464579..4f2e1b74b10 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1045,9 +1045,9 @@ Preserves old cursor, marks/flags, hidden-p." ;; treat top level dir extra (it may contain wildcards) (dired-uncache (if (consp dired-directory) (car dired-directory) dired-directory)) - (dired-readin) + ;; Run dired-after-readin-hook just once, below. (let ((dired-after-readin-hook nil)) - ;; don't run that hook for each subdir... + (dired-readin) (dired-insert-old-subdirs old-subdir-alist)) (dired-mark-remembered mark-alist) ; mark files that were marked ;; ... run the hook for the whole buffer, and only after markers @@ -3098,15 +3098,18 @@ The idea is to set this buffer-locally in special dired buffers.") ;; Modeline display of "by name" or "by date" guarantees the user a ;; match with the corresponding regexps. Non-matching switches are ;; shown literally. - (setq mode-name - (let (case-fold-search) - (cond ((string-match dired-sort-by-name-regexp dired-actual-switches) - "Dired by name") - ((string-match dired-sort-by-date-regexp dired-actual-switches) - "Dired by date") - (t - (concat "Dired " dired-actual-switches))))) - (force-mode-line-update)) + (when (eq major-mode 'dired-mode) + (setq mode-name + (let (case-fold-search) + (cond ((string-match + dired-sort-by-name-regexp dired-actual-switches) + "Dired by name") + ((string-match + dired-sort-by-date-regexp dired-actual-switches) + "Dired by date") + (t + (concat "Dired " dired-actual-switches))))) + (force-mode-line-update))) (defun dired-sort-toggle-or-edit (&optional arg) "Toggle between sort by date/name and refresh the dired buffer. @@ -3162,7 +3165,7 @@ set the minor mode accordingly, others appear literally in the mode line. With optional second arg NO-REVERT, don't refresh the listing afterwards." (dired-sort-R-check switches) (setq dired-actual-switches switches) - (if (eq major-mode 'dired-mode) (dired-sort-set-modeline)) + (dired-sort-set-modeline) (or no-revert (revert-buffer))) (defvar dired-subdir-alist-pre-R nil diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el index 0744cc52964..5a508b31c5e 100644 --- a/lisp/dirtrack.el +++ b/lisp/dirtrack.el @@ -1,6 +1,6 @@ ;;; dirtrack.el --- Directory Tracking by watching the prompt -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> diff --git a/lisp/disp-table.el b/lisp/disp-table.el index 55438beb27a..d436a33e477 100644 --- a/lisp/disp-table.el +++ b/lisp/disp-table.el @@ -1,6 +1,6 @@ ;;; disp-table.el --- functions for dealing with char tables -;; Copyright (C) 1987, 1994, 1995, 1999, 2002, 2003, 2004, +;; Copyright (C) 1987, 1994, 1995, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index 7270dc8fa27..b50a1a2ea85 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -1,6 +1,6 @@ ;;; dos-fns.el --- MS-Dos specific functions -;; Copyright (C) 1991, 1993, 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1991, 1993, 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Morten Welinder <terra@diku.dk> diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el index 9d00756804f..b79238fc888 100644 --- a/lisp/dos-vars.el +++ b/lisp/dos-vars.el @@ -1,6 +1,6 @@ ;;; dos-vars.el --- MS-Dos specific user options -;; Copyright (C) 1998, 2002, 2003, 2004, 2005, +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index 5fb6d5a0f6b..bce5cbcdc8a 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el @@ -1,6 +1,6 @@ ;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: Geoff Voelker <voelker@cs.washington.edu> diff --git a/lisp/double.el b/lisp/double.el index 25fd2c42672..01753342b47 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -1,6 +1,6 @@ ;;; double.el --- support for keyboard remapping with double clicking -;; Copyright (C) 1994, 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index 8bfbb53b187..9072d911946 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -1,6 +1,6 @@ ;;; ebuff-menu.el --- electric-buffer-list mode -;; Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@ai.mit.edu> diff --git a/lisp/echistory.el b/lisp/echistory.el index 46a1f532c74..85c94d5d3dd 100644 --- a/lisp/echistory.el +++ b/lisp/echistory.el @@ -1,6 +1,6 @@ ;;; echistory.el --- Electric Command History Mode -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 7786326bea9..34a1ceda254 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -133,9 +133,13 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP." (defcustom ediff-diff-options "" "*Options to pass to `ediff-diff-program'. If Unix diff is used as `ediff-diff-program', - then a useful option is `-w', to ignore space. -Options `-c' and `-i' are not allowed. Case sensitivity can be - toggled interactively using \\[ediff-toggle-ignore-case]." +then a useful option is `-w', to ignore space. +Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be +toggled interactively using \\[ediff-toggle-ignore-case]. + +This variable is not for customizing the look of the differences produced by +the command \\[ediff-show-diff-output]. Use the variable +`ediff-custom-diff-options' for that." :set 'ediff-reset-diff-options :type 'string :group 'ediff-diff) @@ -254,10 +258,10 @@ one optional arguments, diff-number to refine.") ;; ediff-setup-diff-regions-function, which can also have the value ;; ediff-setup-diff-regions3, which takes 4 arguments. (defun ediff-setup-diff-regions (file-A file-B file-C) - ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options - (if (string-match "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]" + ;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options + (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" ediff-diff-options) - (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'")) + (error "Options `-c', `-u', and `-i' are not allowed in `ediff-diff-options'")) ;; create, if it doesn't exist (or (ediff-buffer-live-p ediff-diff-buffer) diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 92f462c0181..2dba9e4116b 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -62,7 +62,7 @@ Valid values are the symbols `default-A', `default-B', and `combined'." '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") "*Pattern to be used for combining difference regions in buffers A and B. The value must be a list of the form -(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) +\(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) where bufspec is the symbol A, B, or Ancestor. For instance, if the value is '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the combined text will look like this: @@ -82,7 +82,7 @@ STRING4 (defcustom ediff-show-clashes-only nil "*If t, show only those diff regions where both buffers disagree with the ancestor. This means that regions that have status prefer-A or prefer-B will be -skipped over. nil means show all regions." +skipped over. A value of nil means show all regions." :type 'boolean :group 'ediff-merge ) diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 4cd1492a1c7..eb34e183822 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -1,6 +1,6 @@ ;;; ediff-vers.el --- version control interface to Ediff -;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 3b562bbdbdf..aa38151053d 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -1,6 +1,6 @@ ;;; edmacro.el --- keyboard macro editor -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> diff --git a/lisp/electric.el b/lisp/electric.el index e4506190571..ef4bff48c6f 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -1,6 +1,6 @@ ;;; electric.el --- window maker and Command loop for `electric' modes -;; Copyright (C) 1985, 1986, 1995, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/elide-head.el b/lisp/elide-head.el index 6f14a5275a8..ef10be39623 100644 --- a/lisp/elide-head.el +++ b/lisp/elide-head.el @@ -1,6 +1,6 @@ ;;; elide-head.el --- hide headers in files -;; Copyright (C) 1999, 2002, 2003, 2004, 2005, +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 5aa8bbd14cc..f6037c065fe 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1,6 +1,6 @@ ;;; advice.el --- an overloading mechanism for Emacs Lisp functions -;; Copyright (C) 1993, 1994, 2000, 2001, 2004, +;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el index f3d0b9efc9b..1d710cceb48 100644 --- a/lisp/emacs-lisp/assoc.el +++ b/lisp/emacs-lisp/assoc.el @@ -1,6 +1,6 @@ ;;; assoc.el --- insert/delete/sort functions on association lists -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 3c2d937624e..a19f054a468 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> @@ -75,7 +75,7 @@ files.") (nil "(afs@hplb.hpl.hp.com)") (nil "<Use-Author-Address-Header@\\[127.1\\]>") (nil "Code Extracted") - (nil "Fsf") + (nil "\\`FSF") (nil "ISO-2022-JP") ("Jaeyoun Chung" "Jae-youn Chung" "Jae-you Chung" "Chung Jae-youn") ("Jan Dj,Ad(Brv" "Jan D." "Jan Djarv") @@ -300,6 +300,8 @@ found) in the repository.") ("GETTING.GNU.SOFTWARE" . "FTP") ("leim-Makefile" . "leim/Makefile") ("leim-Makefile.in" . "leim/Makefile.in") + ("emacs-lisp/testcover-ses.el" . "tcover-ses.el") + ("emacs-lisp/testcover-unsafep.el" . "tcover-unsafep.el") ("INSTALL-CVS" . "INSTALL.CVS") ) "Alist of files which have been renamed during their lifetime. diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 792272ef88a..6053fb3cf09 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -319,8 +319,8 @@ ((eq type 'struct) (setq data (bindat--unpack-group (eval len)))) ((eq type 'repeat) - (let ((index 0)) - (while (< index len) + (let ((index 0) (count len)) + (while (< index count) (setq data (cons (bindat--unpack-group (nthcdr tail item)) data)) (setq index (1+ index))) (setq data (nreverse data)))) @@ -415,8 +415,8 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (bindat--length-group (if field (bindat-get-field struct field) struct) (eval len))) ((eq type 'repeat) - (let ((index 0)) - (while (< index len) + (let ((index 0) (count len)) + (while (< index count) (bindat--length-group (nth index (bindat-get-field struct field)) (nthcdr tail item)) @@ -559,8 +559,8 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (bindat--pack-group (if field (bindat-get-field struct field) struct) (eval len))) ((eq type 'repeat) - (let ((index 0)) - (while (< index len) + (let ((index 0) (count len)) + (while (< index count) (bindat--pack-group (nth index (bindat-get-field struct field)) (nthcdr tail item)) diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index ba68b842305..9c6da5f7b3c 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -1,6 +1,6 @@ ;;; byte-run.el --- byte-compiler support for inlining -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com> diff --git a/lisp/emacs-lisp/cl-compat.el b/lisp/emacs-lisp/cl-compat.el index 34f9642fe1f..8b2c786ca04 100644 --- a/lisp/emacs-lisp/cl-compat.el +++ b/lisp/emacs-lisp/cl-compat.el @@ -1,6 +1,6 @@ ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility) -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 2e741408c04..55c95b655d4 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -1,6 +1,6 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index b7d63acc861..ba556512532 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,6 +1,7 @@ ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 @@ -2291,10 +2292,15 @@ copier, a `NAME-p' predicate, and setf-able `NAME-SLOT' accessors. (if (cadr (memq :read-only (cddr desc))) (list 'error (format "%s is a read-only slot" accessor)) - (list 'cl-struct-setf-expander 'cl-x - (list 'quote name) (list 'quote accessor) - (and pred-check (list 'quote pred-check)) - pos))) + ;; If cl is loaded only for compilation, + ;; the call to cl-struct-setf-expander would + ;; cause a warning because it may not be + ;; defined at run time. Suppress that warning. + (list 'with-no-warnings + (list 'cl-struct-setf-expander 'cl-x + (list 'quote name) (list 'quote accessor) + (and pred-check (list 'quote pred-check)) + pos)))) forms) (if print-auto (nconc print-func diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index 6b14acd23df..11609d8a4ca 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -1,6 +1,6 @@ ;;; cl-seq.el --- Common Lisp features, part 3 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index 9d3f1f63061..644d0736d84 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -1,6 +1,6 @@ ;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Keywords: lisp, tools, maint diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index d2d68189230..0c9091e2128 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -1,6 +1,6 @@ ;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 11d4d7fb2ba..6fd98583ccc 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -1,7 +1,7 @@ ;;; crm.el --- read multiple strings with completion ;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: completion, minibuffer, multiple elements diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el index f37a5348552..c38702c38f6 100644 --- a/lisp/emacs-lisp/cust-print.el +++ b/lisp/emacs-lisp/cust-print.el @@ -1,6 +1,6 @@ ;;; cust-print.el --- handles print-level and print-circle -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 10482bd49c4..8bb4e5f7643 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -1,7 +1,7 @@ ;;; derived.el --- allow inheritance of major modes ;; (formerly mode-clone.el) -;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index de8f0a91af4..213854edb54 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -274,7 +274,7 @@ With zero or negative ARG turn mode off. (defalias 'easy-mmode-define-global-mode 'define-global-minor-mode) ;;;###autoload (defmacro define-global-minor-mode (global-mode mode turn-on &rest keys) - "Make GLOBAL-MODE out of the buffer-local minor MODE. + "Make a global mode GLOBAL-MODE corresponding to buffer-local minor MODE. TURN-ON is a function that will be called with no args in every buffer and that should try to turn MODE on if applicable for that buffer. KEYS is a list of CL-style keyword arguments. As the minor mode diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index 92f5251a8b1..06cafb17e61 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -1,7 +1,7 @@ ;;; easymenu.el --- support the easymenu interface for defining a menu -;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: Richard Stallman <rms@gnu.org> @@ -443,20 +443,24 @@ When non-nil, NOEXP indicates that CALLBACK cannot be an expression command)) ;;;###autoload -(defun easy-menu-change (path name items &optional before) +(defun easy-menu-change (path name items &optional before map) "Change menu found at PATH as item NAME to contain ITEMS. PATH is a list of strings for locating the menu that should contain a submenu named NAME. ITEMS is a list of menu items, as in `easy-menu-define'. These items entirely replace the previous items in that submenu. +If MAP is specified, it should normally be a keymap; nil stands for the local +menu-bar keymap. It can also be a symbol, which has earlier been used as the +first argument in a call to `easy-menu-define', or the value of such a symbol. + If the menu located by PATH has no submenu named NAME, add one. If the optional argument BEFORE is present, add it just before the submenu named BEFORE, otherwise add it at the end of the menu. To implement dynamic menus, either call this from `menu-bar-update-hook' or use a menu filter." - (easy-menu-add-item nil path (easy-menu-create-menu name items) before)) + (easy-menu-add-item map path (easy-menu-create-menu name items) before)) ;; XEmacs needs the following two functions to add and remove menus. ;; In Emacs this is done automatically when switching keymaps, so diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 98d778f1507..3bf34279b79 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -1,6 +1,6 @@ ;;; eldoc.el --- show function arglist or variable docstring in echo area -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com> diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 85c0026e801..124817427d6 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -1,6 +1,6 @@ ;;; elint.el --- Lint Emacs Lisp -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Peter Liljenberg <petli@lysator.liu.se> diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index b4857f4310d..0ffaf564ba4 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -1,7 +1,7 @@ ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Cederqvist <ceder@lysator.liu.se> ;; Inge Wallin <inge@lysator.liu.se> diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index a51493d22ea..35ba803d78e 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -397,7 +397,7 @@ The library where VARIABLE is defined is searched for in FILE or ;;;###autoload (defun find-variable (variable) - "Find the definition of the VARIABLE near point. + "Find the definition of the VARIABLE at or before point. Finds the library containing the definition of the variable near point (selected by `variable-at-point') in a buffer and diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el index dedadfa8c36..482a72eece2 100644 --- a/lisp/emacs-lisp/find-gc.el +++ b/lisp/emacs-lisp/find-gc.el @@ -1,6 +1,6 @@ ;;; find-gc.el --- detect functions that call the garbage collector -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el index fb367d1cac4..dc630e72c92 100644 --- a/lisp/emacs-lisp/float-sup.el +++ b/lisp/emacs-lisp/float-sup.el @@ -1,6 +1,6 @@ ;;; float-sup.el --- define some constants useful for floating point numbers. -;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el index 20df0b7ad6f..b8f944ea8bc 100644 --- a/lisp/emacs-lisp/generic.el +++ b/lisp/emacs-lisp/generic.el @@ -1,6 +1,6 @@ ;;; generic.el --- defining simple major modes with comment and font-lock ;; -;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Peter Breton <pbreton@cs.umb.edu> diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el index d6b963a7e3d..6fc2dba9273 100644 --- a/lisp/emacs-lisp/gulp.el +++ b/lisp/emacs-lisp/gulp.el @@ -1,6 +1,6 @@ ;;; gulp.el --- ask for updates for Lisp packages -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Sam Shteingold <shteingd@math.ucla.edu> diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el index 92eb86ce676..a7cf792a4ba 100644 --- a/lisp/emacs-lisp/helper.el +++ b/lisp/emacs-lisp/helper.el @@ -1,6 +1,6 @@ ;;; helper.el --- utility help package supporting help in electric modes -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 6bc7da7ba28..895bec256d4 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -1,6 +1,6 @@ ;;; lisp.el --- Lisp editing commands for Emacs -;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1994, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF @@ -185,13 +185,18 @@ With ARG, do it that many times. Negative arg -N means move forward to Nth following beginning of defun. Returns t unless search stops due to beginning or end of buffer. -Normally a defun starts when there is a char with open-parenthesis -syntax at the beginning of a line. If `defun-prompt-regexp' is -non-nil, then a string which matches that regexp may precede the -open-parenthesis, and point ends up at the beginning of the line. - If variable `beginning-of-defun-function' is non-nil, its value -is called as a function to find the defun's beginning." +is called as a function to find the defun's beginning. + +Normally a defun is assumed to start where there is a char with +open-parenthesis syntax at the beginning of a line. If +`defun-prompt-regexp' is non-nil, then a string which matches +that regexp may precede the open-parenthesis, and point ends up +at the beginning of the line. + +If `defun-prompt-regexp' and `open-paren-in-column-0-is-defun-start' +are both nil, the function instead finds an open-paren at the +outermost level." (interactive "p") (or (not (eq this-command 'beginning-of-defun)) (eq last-command 'beginning-of-defun) @@ -208,9 +213,9 @@ is non-nil. If variable `beginning-of-defun-function' is non-nil, its value is called as a function to find the defun's beginning." - (interactive "p") ; change this to "P", maybe, if we ever come to pass ARG - ; to beginning-of-defun-function. - (unless arg (setq arg 1)) ; The call might not be interactive. + (interactive "p") ; change this to "P", maybe, if we ever come to pass ARG + ; to beginning-of-defun-function. + (unless arg (setq arg 1)) (cond (beginning-of-defun-function (if (> arg 0) @@ -230,42 +235,56 @@ is called as a function to find the defun's beginning." nil 'move arg) (progn (goto-char (1- (match-end 0)))) t)) + ;; If open-paren-in-column-0-is-defun-start and defun-prompt-regexp + ;; are both nil, column 0 has no significance - so scan forward + ;; from BOB to see how nested point is, then carry on from there. + ;; + ;; It is generally not a good idea to land up here, because the + ;; call to scan-lists below can be extremely slow. This is because + ;; back_comment in syntax.c may have to scan from bob to find the + ;; beginning of each comment. Fixing this is not trivial -- cyd. + + ((eq arg 0)) (t - ;; Column 0 has no significance - so scan forward from BOB to see how - ;; nested point is, then carry on from there. - (let* ((floor (point-min)) - (ceiling (point-max)) - (pps-state (let (syntax-begin-function - font-lock-beginning-of-syntax-function) - (syntax-ppss))) - (nesting-depth (nth 0 pps-state))) + (let ((floor (point-min)) + (ceiling (point-max)) + (arg-+ve (> arg 0))) (save-restriction (widen) - ;; Get outside of any string or comment. - (if (nth 8 pps-state) - (goto-char (nth 8 pps-state))) - - (cond - ((> arg 0) - (when (> nesting-depth 0) - (up-list (- nesting-depth)) - (setq arg (1- arg))) - ;; We're now outside of any defun. - (backward-list arg) - (if (< (point) floor) (goto-char floor))) - - ((< arg 0) - (cond - ((> nesting-depth 0) - (up-list nesting-depth) - (setq arg (1+ arg))) - ((not (looking-at "\\s(")) - ;; We're between defuns, and not at the start of one. - (setq arg (1+ arg)))) - (forward-list (- arg)) - (down-list) - (backward-char) - (if (> (point) ceiling) (goto-char ceiling))))))))) + (let ((ppss (let (syntax-begin-function + font-lock-beginning-of-syntax-function) + (syntax-ppss))) + ;; position of least enclosing paren, or nil. + encl-pos) + ;; Back out of any comment/string, so that encl-pos will always + ;; become nil if we're at top-level. + (when (nth 8 ppss) + (goto-char (nth 8 ppss)) + (setq ppss (syntax-ppss))) ; should be fast, due to cache. + (setq encl-pos (syntax-ppss-toplevel-pos ppss)) + (if encl-pos (goto-char encl-pos)) + + (and encl-pos arg-+ve (setq arg (1- arg))) + (and (not encl-pos) (not arg-+ve) (not (looking-at "\\s(")) + (setq arg (1+ arg))) + + (condition-case nil ; to catch crazy parens. + (progn + (goto-char (scan-lists (point) (- arg) 0)) + (if arg-+ve + (if (>= (point) floor) + t + (goto-char floor) + nil) + ;; forward to next (, or trigger the c-c + (goto-char (1- (scan-lists (point) 1 -1))) + (if (<= (point) ceiling) + t + (goto-char ceiling) + nil))) + (error + (goto-char (if arg-+ve floor ceiling)) + nil)))))))) (defvar end-of-defun-function nil "If non-nil, function for function `end-of-defun' to call. diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el index aa87b7fed09..0f6904356ae 100644 --- a/lisp/emacs-lisp/lmenu.el +++ b/lisp/emacs-lisp/lmenu.el @@ -1,6 +1,6 @@ ;;; lmenu.el --- emulate Lucid's menubar support -;; Copyright (C) 1992, 1993, 1994, 1997, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Keywords: emulations obsolete diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el index 5aed4822818..8b18d1a1123 100644 --- a/lisp/emacs-lisp/lselect.el +++ b/lisp/emacs-lisp/lselect.el @@ -1,6 +1,6 @@ ;;; lselect.el --- Lucid interface to X Selections -;; Copyright (C) 1990, 1993, 2002, 2003, 2004, +;; Copyright (C) 1990, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index dc966a75cd6..7b2dac6cd45 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -1,6 +1,6 @@ ;;; map-ynp.el --- general-purpose boolean question-asker -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003, +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org> diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 931ebf28bd2..894ff1a8967 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -1,6 +1,6 @@ ;;; regexp-opt.el --- generate efficient regexps to match strings -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org> diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el index 06ed2880ee1..bc6c9983b19 100644 --- a/lisp/emacs-lisp/regi.el +++ b/lisp/emacs-lisp/regi.el @@ -1,6 +1,6 @@ ;;; regi.el --- REGular expression Interpreting engine -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com> diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el index c5391f94b05..f775513e961 100644 --- a/lisp/emacs-lisp/ring.el +++ b/lisp/emacs-lisp/ring.el @@ -1,6 +1,6 @@ ;;; ring.el --- handle rings of items -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 7162aa822b7..98f3e30f10e 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -1,6 +1,6 @@ ;;; shadow.el --- locate Emacs Lisp file shadowings -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Terry Jones <terry@santafe.edu> diff --git a/lisp/emacs-lisp/sregex.el b/lisp/emacs-lisp/sregex.el index 23145bccc36..5d37eb99859 100644 --- a/lisp/emacs-lisp/sregex.el +++ b/lisp/emacs-lisp/sregex.el @@ -1,6 +1,6 @@ ;;; sregex.el --- symbolic regular expressions -;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Bob Glickstein <bobg+sregex@zanshin.com> diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index 695d7877b38..0937076a7f4 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -52,6 +52,22 @@ (defsubst syntax-ppss-depth (ppss) (nth 0 ppss)) +(defun syntax-ppss-toplevel-pos (ppss) + "Get the latest syntactically outermost position found in a syntactic scan. +PPSS is a scan state, as returned by `partial-parse-sexp' or `syntax-ppss'. +An \"outermost position\" means one that it is outside of any syntactic entity: +outside of any parentheses, comments, or strings encountered in the scan. +If no such position is recorded in PPSS (because the end of the scan was +itself at the outermost level), return nil." + ;; BEWARE! We rely on the undocumented 9th field. The 9th field currently + ;; contains the list of positions of the enclosing open-parens. + ;; I.e. those positions are outside of any string/comment and the first of + ;; those is outside of any paren (i.e. corresponds to a nil ppss). + ;; If this list is empty but we are in a string or comment, then the 8th + ;; field contains a similar "toplevel" position. + (or (car (nth 9 ppss)) + (nth 8 ppss))) + (defsubst syntax-ppss-context (ppss) (cond ((nth 3 ppss) 'string) @@ -87,8 +103,7 @@ point (where the PPSS is equivalent to nil).") ;; depend on the text after BEG (which is presumably changed). So if ;; BEG=(car (nth 10 syntax-ppss-last)) don't reuse that data because the ;; assumed nil state at BEG may not be valid any more. - (if (<= beg (or (car (nth 10 syntax-ppss-last)) - (nth 9 syntax-ppss-last) + (if (<= beg (or (syntax-ppss-toplevel-pos (cdr syntax-ppss-last)) (nth 3 syntax-ppss-last) 0)) (setq syntax-ppss-last nil) @@ -136,22 +151,14 @@ Point is at POS when this function returns." (cond ;; Use OLD-PPSS if possible and close enough. ((and (not old-pos) old-ppss - ;; BEWARE! We rely on the undocumented 9th field. The 9th - ;; field currently contains the list of positions of - ;; open-parens of the enclosing parens. I.e. those - ;; positions are outside of any string/comment - ;; and the first of those is outside of any paren - ;; (i.e. corresponds to a nil ppss). If this list is empty - ;; but we are in a string or comment, then the 8th field - ;; contains a similar "toplevel" position. If `pt-min' is - ;; too far from `pos', we could try to use other positions - ;; in (nth 9 old-ppss), but that doesn't seem to happen in - ;; practice and it would complicate this code (and the - ;; before-change-function code even more). But maybe it - ;; would be useful in "degenerate" cases such as when the - ;; whole file is wrapped in a set of parenthesis. - (setq pt-min (or (car (nth 9 old-ppss)) - (nth 8 old-ppss) + ;; If `pt-min' is too far from `pos', we could try to use + ;; other positions in (nth 9 old-ppss), but that doesn't + ;; seem to happen in practice and it would complicate this + ;; code (and the before-change-function code even more). + ;; But maybe it would be useful in "degenerate" cases such + ;; as when the whole file is wrapped in a set + ;; of parentheses. + (setq pt-min (or (syntax-ppss-toplevel-pos old-ppss) (nth 2 old-ppss))) (<= pt-min pos) (< (- pos pt-min) syntax-ppss-max-span)) (incf (car (aref syntax-ppss-stats 1))) diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 0c66a207351..4ad4dac1d58 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -1,6 +1,6 @@ ;;; timer.el --- run a function with args at some time in future -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el index 1e1e143f0f0..7c4303b5b79 100644 --- a/lisp/emacs-lisp/tq.el +++ b/lisp/emacs-lisp/tq.el @@ -1,6 +1,6 @@ ;;; tq.el --- utility to maintain a transaction queue -;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Scott Draves <spot@cs.cmu.edu> diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el index 191be58c0b5..5250a34b3fd 100644 --- a/lisp/emacs-lisp/trace.el +++ b/lisp/emacs-lisp/trace.el @@ -1,6 +1,6 @@ ;;; trace.el --- tracing facility for Emacs Lisp functions -;; Copyright (C) 1993, 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu> diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index 6fb9e8ec7cb..f0655c306b9 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -1,6 +1,6 @@ ;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked -;; Copyright (C) 1994, 1997, 2002, 2003, 2004, +;; Copyright (C) 1994, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc ;; Author: Tom Wurgler <twurgler@goodyear.com> diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 361d1b98d3b..0d629d69235 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -1,6 +1,6 @@ ;;; crisp.el --- CRiSP/Brief Emacs emulator -;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM> diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 236e3e2c9ad..194b7e2c326 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -317,11 +317,19 @@ If the value is nil, use a shifted prefix key to inhibit the override." :group 'cua) (defcustom cua-toggle-set-mark t - "*In non-nil, the `cua-set-mark' command toggles the mark." + "*If non-nil, the `cua-set-mark' command toggles the mark." :type '(choice (const :tag "Disabled" nil) (other :tag "Enabled" t)) :group 'cua) +(defcustom cua-auto-mark-last-change nil + "*If non-nil, set implicit mark at position of last buffer change. +This means that \\[universal-argument] \\[cua-set-mark] will jump to the position +of the last buffer change before jumping to the explicit marks on the mark ring. +See `cua-set-mark' for details." + :type 'boolean + :group 'cua) + (defcustom cua-enable-register-prefix 'not-ctrl-u "*If non-nil, registers are supported via numeric prefix arg. If the value is t, any numeric prefix arg in the range 0 to 9 will be @@ -358,6 +366,15 @@ managers, so try setting this to nil, if prefix override doesn't work." :type 'boolean :group 'cua) +(defcustom cua-paste-pop-rotate-temporarily nil + "*If non-nil, \\[cua-paste-pop] only rotates the kill-ring temporarily. +This means that both \\[yank] and the first \\[yank-pop] in a sequence always insert +the most recently killed text. Each immediately following \\[cua-paste-pop] replaces +the previous text with the next older element on the `kill-ring'. +With prefix arg, \\[universal-argument] \\[yank-pop] inserts the same text as the most +recent \\[yank-pop] (or \\[yank]) command." + :type 'boolean + :group 'cua) ;;; Rectangle Customization @@ -912,15 +929,53 @@ If global mark is active, copy from register or one character." (clipboard-yank)) (t (yank arg))))))) + +;; cua-paste-pop-rotate-temporarily == t mechanism: +;; +;; C-y M-y M-y => only rotates kill ring temporarily, +;; so next C-y yanks what previous C-y yanked, +;; +;; M-y M-y M-y => equivalent to C-y M-y M-y +;; +;; But: After another command, C-u M-y remembers the temporary +;; kill-ring position, so +;; C-u M-y => yanks what the last M-y yanked +;; + +(defvar cua-paste-pop-count nil) + (defun cua-paste-pop (arg) "Replace a just-pasted text or rectangle with a different text. -See `yank-pop' for details." +See `yank-pop' for details about the default behaviour. For an alternative +behaviour, see `cua-paste-pop-rotate-temporarily'." (interactive "P") - (if (eq last-command 'cua--paste-rectangle) - (progn - (undo) - (yank arg)) - (yank-pop (prefix-numeric-value arg)))) + (cond + ((eq last-command 'cua--paste-rectangle) + (undo) + (yank arg)) + ((not cua-paste-pop-rotate-temporarily) + (yank-pop (prefix-numeric-value arg))) + (t + (let ((rotate (if (consp arg) 1 (prefix-numeric-value arg)))) + (cond + ((or (null cua-paste-pop-count) + (eq last-command 'yank) + (eq last-command 'cua-paste)) + (setq cua-paste-pop-count rotate) + (setq last-command 'yank) + (yank-pop cua-paste-pop-count)) + ((and (eq last-command 'cua-paste-pop) (not (consp arg))) + (setq cua-paste-pop-count (+ cua-paste-pop-count rotate)) + (setq last-command 'yank) + (yank-pop cua-paste-pop-count)) + (t + (setq cua-paste-pop-count + (if (consp arg) (+ cua-paste-pop-count rotate -1) 1)) + (yank (1+ cua-paste-pop-count))))) + ;; Undo rotating the kill-ring, so next C-y will + ;; yank the original head. + (setq kill-ring-yank-pointer kill-ring) + (setq this-command 'cua-paste-pop)))) (defun cua-exchange-point-and-mark (arg) "Exchanges point and mark, but don't activate the mark. @@ -961,14 +1016,14 @@ of text." (if (and s (= (cdr u) s)) (setq s (car u)) (setq s (car u) e (cdr u))))))) - (setq cua--repeat-replace-text - (cond ((and s e (<= s e) (= s (mark t))) - (filter-buffer-substring s e nil t)) - ((and (null s) (eq u elt)) ;; nothing inserted - "") - (t - (message "Cannot locate replacement text") - nil)))))) + (cond ((and s e (<= s e) (= s (mark t))) + (setq cua--repeat-replace-text + (filter-buffer-substring s e nil t))) + ((and (null s) (eq u elt)) ;; nothing inserted + (setq cua--repeat-replace-text + "")) + (t + (message "Cannot locate replacement text")))))) (setq cua--last-deleted-region-pos nil)) (if (and cua--last-deleted-region-text cua--repeat-replace-text @@ -985,6 +1040,28 @@ of text." ;;; Shift activated / extended region +(defun cua-pop-to-last-change () + (let ((undo-list buffer-undo-list) + pos elt) + (while (and (not pos) + (consp undo-list)) + (setq elt (car undo-list) + undo-list (cdr undo-list)) + (cond + ((integerp elt) + (setq pos elt)) + ((not (consp elt))) + ((and (integerp (cdr elt)) + (or (integerp (car elt)) (stringp (car elt)))) + (setq pos (cdr elt))) + ((and (eq (car elt) 'apply) (consp (cdr elt)) (integerp (cadr elt))) + (setq pos (nth 3 elt))))) + (when (and pos + (/= pos (point)) + (>= pos (point-min)) (<= pos (point-max))) + (goto-char pos) + t))) + (defun cua-set-mark (&optional arg) "Set mark at where point is, clear mark, or jump to mark. @@ -993,12 +1070,15 @@ mark, and push old mark position on local mark ring; also push mark on global mark ring if last mark was set in another buffer. With argument, jump to mark, and pop a new position for mark off -the local mark ring \(this does not affect the global mark ring\). +the local mark ring (this does not affect the global mark ring). Use \\[pop-global-mark] to jump to a mark off the global mark ring -\(see `pop-global-mark'\). +\(see `pop-global-mark'). + +If `cua-auto-mark-last-change' is non-nil, this command behaves as if there +was an implicit mark at the position of the last buffer change. Repeating the command without the prefix jumps to the next position -off the local \(or global\) mark ring. +off the local (or global) mark ring. With a double \\[universal-argument] prefix argument, unconditionally set mark." (interactive "P") @@ -1013,7 +1093,9 @@ With a double \\[universal-argument] prefix argument, unconditionally set mark." (pop-global-mark)) (arg (setq this-command 'pop-to-mark-command) - (pop-to-mark-command)) + (or (and cua-auto-mark-last-change + (cua-pop-to-last-change)) + (pop-to-mark-command))) ((and cua-toggle-set-mark mark-active) (cua--deactivate) (message "Mark Cleared")) diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el index 17308c132e0..f7bca958b72 100644 --- a/lisp/emulation/edt-lk201.el +++ b/lisp/emulation/edt-lk201.el @@ -1,10 +1,10 @@ ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards -;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, +;; Copyright (C) 1986, 1992, 1993, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs. diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index cee60c6ec8e..53bb8e63d33 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -3,8 +3,8 @@ ;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs. @@ -129,8 +129,12 @@ (defconst edt-xserver (if (eq edt-window-system 'x) (if edt-x-emacs-p - (replace-in-string (x-server-vendor) "[ _]" "-") - (subst-char-in-string ? ?- (x-server-vendor))) + ;; The Cygwin window manager has a `/' in its + ;; name, which breaks the generated file name of + ;; the custom key map file. Replace `/' with a + ;; `-' to work around that. + (replace-in-string (x-server-vendor) "[ /]" "-") + (subst-char-in-string ?/ ?- (subst-char-in-string ? ?- (x-server-vendor)))) nil) "Indicates X server vendor name, if applicable.") diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el index 6f393197281..1282e940d9c 100644 --- a/lisp/emulation/edt-pc.el +++ b/lisp/emulation/edt-pc.el @@ -1,10 +1,10 @@ ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards -;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1986, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs. diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el index b4599cdb2cd..cd3e03885eb 100644 --- a/lisp/emulation/edt-vt100.el +++ b/lisp/emulation/edt-vt100.el @@ -3,8 +3,8 @@ ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs. diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index ae131dc50e9..89d017a1cad 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -3,8 +3,8 @@ ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs. @@ -339,8 +339,12 @@ This means that an edt-user.el file was found in the user's `load-path'.") (defconst edt-xserver (if (eq edt-window-system 'x) (if edt-x-emacs19-p - (replace-in-string (x-server-vendor) "[ _]" "-") - (subst-char-in-string ? ?- (x-server-vendor))) + ;; The Cygwin window manager has a `/' in its + ;; name, which breaks the generated file name of + ;; the custom key map file. Replace `/' with a + ;; `-' to work around that. + (replace-in-string (x-server-vendor) "[ /]" "-") + (subst-char-in-string ?/ ?- (subst-char-in-string ? ?- (x-server-vendor)))) nil) "Indicates X server vendor name, if applicable.") diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el index e2b0d36f0f4..af632694bd0 100644 --- a/lisp/emulation/pc-mode.el +++ b/lisp/emulation/pc-mode.el @@ -1,6 +1,6 @@ ;;; pc-mode.el --- emulate certain key bindings used on PCs -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index 5d90728898a..b848f45d7d8 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el @@ -1,6 +1,6 @@ ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT -;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el index 2aed6f464d5..2a84e5ff7d5 100644 --- a/lisp/emulation/tpu-extras.el +++ b/lisp/emulation/tpu-extras.el @@ -1,6 +1,6 @@ ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt -;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el index eb71542e811..349a03fc8eb 100644 --- a/lisp/emulation/tpu-mapper.el +++ b/lisp/emulation/tpu-mapper.el @@ -1,6 +1,6 @@ ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file -;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el index 559d1677347..54fb2d1e997 100644 --- a/lisp/emulation/vi.el +++ b/lisp/emulation/vi.el @@ -820,7 +820,7 @@ The given COUNT is remembered for future scrollings." (defun vi-char-argument (arg) "Get following character (could be any CHAR) as part of the prefix argument. -Possible prefix-arg cases are NIL, INTEGER, (NIL . CHAR) or (INTEGER . CHAR)." +Possible prefix-arg cases are nil, INTEGER, (nil . CHAR) or (INTEGER . CHAR)." (interactive "P") (let ((char (read-char))) (cond ((null arg) (setq prefix-arg (cons nil char))) diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index 8b5109793c0..16db3988c5b 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -1,7 +1,7 @@ ;;; vip.el --- a VI Package for GNU Emacs -;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masahiko Sato <ms@sail.stanford.edu> ;; Keywords: emulations diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index ac3ef55d6e4..d3dae72d13e 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -171,7 +171,9 @@ (run-hook-with-args 'viper-before-change-functions beg end)) (defsubst viper-post-command-sentinel () - (run-hooks 'viper-post-command-hooks) + (condition-case conds + (run-hooks 'viper-post-command-hooks) + (error (viper-message-conditions conds))) (if (eq viper-current-state 'vi-state) (viper-restore-cursor-color 'after-insert-mode))) @@ -926,8 +928,7 @@ Vi's prefix argument will be used. Otherwise, the prefix argument passed to (condition-case nil (let (viper-vi-kbd-minor-mode) ; execute without kbd macros - (setq result (eval form)) - ) + (setq result (eval form))) (error (signal 'quit nil))) @@ -1971,9 +1972,16 @@ Undo previous insertion and inserts new." (if (and (eobp) (not (bolp)) require-final-newline + ;; add newline only if we actually edited buffer. otherwise it + ;; might unintentionally modify binary buffers + (buffer-modified-p) (not (viper-is-in-minibuffer)) (not buffer-read-only)) - (insert "\n"))) + ;; text property may be read-only + (condition-case nil + (insert "\n") + (error nil)) + )) )) (defun viper-yank-defun () diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el index 0230d6e118a..a4a1575f629 100644 --- a/lisp/emulation/ws-mode.el +++ b/lisp/emulation/ws-mode.el @@ -1,6 +1,6 @@ ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs -;; Copyright (C) 1991, 2002, 2003, 2004, 2005, +;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de> diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index dfb6fc7afe8..b356f83b0b2 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,23 @@ +2006-12-13 Leo <sdl.web@gmail.com> (tiny change) + + * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it + isn't active already, instead of leaving it on. + +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * erc-ezbounce.el (erc-ezb-init-session-list): Doc fix. + +2006-12-08 Michael Olson <mwolson@gnu.org> + + * erc.el: Re-evaluate contributions from a contributor, and found + them under 15 lines of non-obvious code, so it is safe to remove + the copyright notice. + (erc-modules): Remove list module. + + * erc-list.el: Remove, since a contributor who has not completed + their assignment has contributed significantly more than 15 lines + of code to this file. + 2006-11-28 Juanma Barranquero <lekktu@gmail.com> * erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify. @@ -18,6 +38,11 @@ (erc-update-current-channel-member, erc-load-script): (erc-mode-line-away-status-format): Doc fixes. +2006-11-20 Andrea Russo <rastandy@inventati.org> + + * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker' + before calling `erc-display-prompt'. + 2006-11-24 Juanma Barranquero <lekktu@gmail.com> * erc.el (erc-after-connect, erc-open-ssl-stream) @@ -86,6 +111,11 @@ `erc-show-my-nick' is non-nil. (erc-compute-server): Doc fix. +2006-10-01 John J Foerch <jjfoerch@earthlink.net> + + * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline + from the erc-timestamp field. + 2006-09-11 Michael Olson <mwolson@gnu.org> * erc-nicklist.el (erc-nicklist-insert-contents): Add missing diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index 20a03801477..25f57569742 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 @@ -1035,7 +1035,7 @@ * erc-speak.el, erc.el: New file. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02 index 006ac0c1415..332bd7fbfb9 100644 --- a/lisp/erc/ChangeLog.02 +++ b/lisp/erc/ChangeLog.02 @@ -2596,7 +2596,7 @@ See ChangeLog.01 for earlier changes. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 6f55258c04e..20f0f92f5e0 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -2140,7 +2140,7 @@ See ChangeLog.02 for earlier changes. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04 index 3ab41db65b4..c5338a311c9 100644 --- a/lisp/erc/ChangeLog.04 +++ b/lisp/erc/ChangeLog.04 @@ -2069,7 +2069,7 @@ See ChangeLog.03 for earlier changes. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05 index 8fa725459e2..a640aba00a1 100644 --- a/lisp/erc/ChangeLog.05 +++ b/lisp/erc/ChangeLog.05 @@ -1217,7 +1217,7 @@ See ChangeLog.04 for earlier changes. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index 1b5111e8525..eeb3e93801e 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -1035,6 +1035,7 @@ other client." (setq erc-dcc-entry-data entry) (setq erc-dcc-unprocessed-output "") (setq erc-insert-marker (set-marker (make-marker) (point-max))) + (setq erc-input-marker (make-marker)) (erc-display-prompt buffer (point-max)) (set-process-buffer proc buffer) (add-hook 'kill-buffer-hook 'erc-dcc-chat-buffer-killed nil t) diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el index d04fe782f7e..ea5afcabcbe 100644 --- a/lisp/erc/erc-ezbounce.el +++ b/lisp/erc/erc-ezbounce.el @@ -126,7 +126,7 @@ in the alist is `nil', prompt for the appropriate values." ;;;###autoload (defun erc-ezb-init-session-list (message) - "Reset the EZBounce session list to NIL." + "Reset the EZBounce session list to nil." (setq erc-ezb-session-list nil) (setq erc-ezb-inside-session-listing t)) @@ -134,7 +134,7 @@ in the alist is `nil', prompt for the appropriate values." (defun erc-ezb-end-of-session-list (message) "Indicate the end of the EZBounce session listing." (setq erc-ezb-inside-session-listing nil)) - + ;;;###autoload (defun erc-ezb-add-session (message) "Add an EZBounce session to the session list." @@ -157,7 +157,7 @@ in the alist is `nil', prompt for the appropriate values." (read-from-minibuffer "IRC port: " (erc-port-to-string "6667"))))) (erc-server-send (format "CONN %s %s" server port))))) - + ;;;###autoload (defun erc-ezb-select-session () @@ -173,7 +173,7 @@ in the alist is `nil', prompt for the appropriate values." (defun erc-ezb-initialize () "Add EZBouncer convenience functions to ERC." (add-hook 'erc-server-NOTICE-functions 'erc-ezb-notice-autodetect)) - + (provide 'erc-ezbounce) ;; arch-tag: e972aa7b-a9f4-4d16-a489-074ec7a1002e diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el deleted file mode 100644 index c041842429e..00000000000 --- a/lisp/erc/erc-list.el +++ /dev/null @@ -1,415 +0,0 @@ -;;; erc-list.el --- Provide a faster channel listing mechanism - -;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 2004 Brian Palmer - -;; Author: Mario Lang <mlang@lexx.delysid.org> -;; Keywords: comm - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. - -;;; Commentary: - -;; This file provides a simple derived mode for viewing Channel lists. -;; It also serves as a demonstration of how the new server hook facility -;; can be used. - -;;; Code: - -(require 'erc) -(require 'erc-networks) -(require 'sort) -(unless (fboundp 'make-overlay) - (require 'overlay)) -(eval-when-compile (require 'cl)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; User customizable variables. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defgroup erc-list nil - "Display IRC channels in another window when using /LIST" - :group 'erc) - -(defcustom erc-chanlist-progress-message t - "*Show progress message while accumulating channel list." - :group 'erc-list - :type 'boolean) - -(defcustom erc-no-list-networks nil - "*A list of network names on which the /LIST command refuses to work." - :group 'erc-list - :type '(repeat string)) - -(defcustom erc-chanlist-frame-parameters nil - "*If nil, the channel list is displayed in a new window; if non-nil, -this variable holds the frame parameters used to make a frame to -display the channel list." - :group 'erc-list - :type 'list) - -(defcustom erc-chanlist-hide-modeline nil - "*If nil, the channel list buffer has a modeline, otherwise the modeline is hidden." - :group 'erc-list - :type 'boolean) - -(defface erc-chanlist-header-face '((t (:bold t))) - "Face used for the headers in erc's channel list." - :group 'erc-faces) - -(defface erc-chanlist-odd-line-face '((t (:inverse-video t))) - "Face used for the odd lines in erc's channel list." - :group 'erc-faces) - -(defface erc-chanlist-even-line-face '((t (:inverse-video nil))) - "Face used for the even lines in erc's channel list." - :group 'erc-faces) - -(defface erc-chanlist-highlight '((t (:foreground "red"))) - "Face used to highlight the current line in the channel list." - :group 'erc-faces) - -;; This should perhaps be a defface that inherits values from the highlight face -;; but xemacs does not support inheritance -(defcustom erc-chanlist-highlight-face 'erc-chanlist-highlight - "Face used for highlighting the current line in a list." - :type 'face - :group 'erc-faces) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; All variables below this line are for internal use only. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defvar erc-chanlist-channel-line-regexp "^\\([#&\\*][^ \t\n]*\\)\\s-+[0-9]+" - "Regexp that matches a channel line in the channel list buffer.") - -(defvar erc-chanlist-buffer nil) -(make-variable-buffer-local 'erc-chanlist-buffer) - -(defvar erc-chanlist-last-time 0 - "A time value used to throttle the progress indicator.") - -(defvar erc-chanlist-frame nil - "The frame displaying the most recent channel list buffer.") - -(defvar erc-chanlist-sort-state 'channel - "The sort mode of the channel list buffer. Either 'channel or 'users.") -(make-variable-buffer-local 'erc-chanlist-sort-state) - -(defvar erc-chanlist-highlight-overlay nil - "The overlay used for erc chanlist highlighting") -(make-variable-buffer-local 'erc-chanlist-highlight-overlay) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Define erc-chanlist-mode. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defcustom erc-chanlist-mode-hook nil - "Hook run by erc-chanlist-mode." - :group 'erc-list - :type 'hook) - -(define-derived-mode erc-chanlist-mode fundamental-mode "ERC Channel List" - "Mode for viewing a channel list of a particular server. - -\\{erc-chanlist-mode-map}" - (local-set-key "\C-c\C-j" 'erc-join-channel) - (local-set-key "j" 'erc-chanlist-join-channel) - (local-set-key "n" 'next-line) - (local-set-key "p" 'previous-line) - (local-set-key "q" 'erc-chanlist-quit) - (local-set-key "s" 'erc-chanlist-toggle-sort-state) - (local-set-key "t" 'toggle-truncate-lines) - (setq erc-chanlist-sort-state 'channel) - (setq truncate-lines t) - (add-hook 'post-command-hook 'erc-chanlist-post-command-hook 'append 'local)) - -;; Define module: -;;;###autoload (autoload 'erc-list-mode "erc-list") -(define-erc-module list nil - "List channels nicely in a separate buffer." - ((defalias 'erc-cmd-LIST 'erc-list-channels)) - ((defalias 'erc-cmd-LIST 'erc-list-channels-simple))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Functions. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;;;###autoload -(defun erc-list-channels (&rest channel) - "Display a buffer containing a list of channels on the current server. -Optional argument CHANNEL specifies a single channel to list (instead of every -available channel)." - (interactive - (remove "" (split-string - (read-from-minibuffer "List channels (RET for all): ") " "))) - (if (and (null channel) - (erc-member-ignore-case (erc-network-name) erc-no-list-networks)) - (erc-display-line "ERC is configured not to allow the /LIST command on this network!" - (current-buffer)) - (erc-display-line (erc-make-notice (concat "Listing channel" - (if channel - "." - "s. This may take a while.")))) - (erc-chanlist channel)) - t) - -(defun erc-list-channels-simple (&optional line) - "Send the LIST command to the current server with optional channels LINE." - (when (string-match "^\\s-*\\(.*\\)$" line) - (let ((channels (match-string 1 line))) - (erc-log (format "cmd: LIST: %s" channels)) - (erc-server-send - (if (string= channels "") - "LIST" - (concat "LIST :" channels)))) - t)) -(put 'erc-list-channels-simple 'do-not-parse-args t) - -;;;###autoload -(defun erc-chanlist (&optional channels) - "Show a channel listing of the current server in a special mode. -Please note that this function only works with IRC servers which conform -to RFC and send the LIST header (#321) at start of list transmission." - (interactive) - (with-current-buffer (erc-server-buffer) - (erc-once-with-server-event - 321 - '(progn - (add-hook 'erc-server-322-functions 'erc-chanlist-322 nil t) - - (erc-once-with-server-event - 323 - '(progn - (remove-hook 'erc-server-322-functions 'erc-chanlist-322 t) - (let ((buf erc-chanlist-buffer)) - (if (not (buffer-live-p buf)) - (error "`erc-chanlist-buffer' does not refer to a live buffer")) - - (set-buffer buf) - (buffer-disable-undo) - (let (buffer-read-only - (sort-fold-case t)) - (sort-lines nil (point-min) (point-max)) - (setq erc-chanlist-sort-state 'channel) - - (let ((sum (count-lines (point-min) (point-max)))) - (goto-char (point-min)) - (insert (substitute-command-keys - (concat "'\\[erc-chanlist-toggle-sort-state]' toggle sort mode.\n" - "'\\[erc-chanlist-quit]' kill this buffer.\n" - "'\\[toggle-truncate-lines]' toggle line truncation.\n" - "'\\[erc-chanlist-join-channel]' join the channel listed on the current line.\n\n"))) - (insert (format "%d channels (sorted by %s).\n\n" - sum (if (eq erc-chanlist-sort-state 'channel) - "channel name" - "number of users")))) - - (insert (format "%-25s%5s %s\n------------------------ ----- ----------------------------\n" - "Channel" - "Users" - "Topic")) - - ;; Display the channel list buffer. - (if erc-chanlist-frame-parameters - (progn - (if (or (null erc-chanlist-frame) - (not (frame-live-p erc-chanlist-frame))) - (setq erc-chanlist-frame - (make-frame `((name . ,(format "Channels on %s" - erc-session-server)) - ,@erc-chanlist-frame-parameters)))) - (select-frame erc-chanlist-frame) - (switch-to-buffer buf) - (erc-prettify-channel-list)) - (pop-to-buffer buf) - (erc-prettify-channel-list)))) - (goto-char (point-min)) - (search-forward-regexp "^------" nil t) - (forward-line 1) - (erc-chanlist-highlight-line) - (message "") - t)) - - (setq erc-chanlist-buffer (get-buffer-create - (format "*Channels on %s*" - (erc-response.sender parsed)))) - (with-current-buffer erc-chanlist-buffer - (setq buffer-read-only nil) - (erase-buffer) - (erc-chanlist-mode) - (setq erc-server-process proc) - (if erc-chanlist-hide-modeline - (setq mode-line-format nil)) - (setq buffer-read-only t)) - t)) - - ;; Now that we've setup our callbacks, pull the trigger. - (if (interactive-p) - (message "Collecting channel list for server %s" erc-session-server)) - (erc-server-send (if (null channels) - "LIST" - (concat "LIST " - (mapconcat #'identity channels ",")))))) - -(defun erc-chanlist-322 (proc parsed) - "Process an IRC 322 message. - -The message carries information about one channel for the LIST -command." - (multiple-value-bind (channel num-users) - (cdr (erc-response.command-args parsed)) - (let ((topic (erc-response.contents parsed))) - (with-current-buffer erc-chanlist-buffer - (save-excursion - (goto-char (point-max)) - (let (buffer-read-only) - (insert (format "%-26s%4s %s\n" (erc-controls-strip channel) - num-users - (erc-controls-strip topic)))) - - ;; Maybe display a progress indicator in the minibuffer. - (when (and erc-chanlist-progress-message - (> (erc-time-diff - erc-chanlist-last-time (erc-current-time)) - 3)) - (setq erc-chanlist-last-time (erc-current-time)) - (message "Accumulating channel list ... %c" - (aref [?/ ?| ?\\ ?- ?! ?O ?o] (random 7)))) - - ;; Return success to prevent other hook functions from being run. - t))))) - -(defun erc-chanlist-post-command-hook () - "Keep the current line highlighted." - (ignore-errors - (save-excursion - (beginning-of-line) - (if (looking-at erc-chanlist-channel-line-regexp) - (erc-chanlist-highlight-line) - (erc-chanlist-dehighlight-line))))) - -(defun erc-chanlist-highlight-line () - "Highlight the current line." - (unless erc-chanlist-highlight-overlay - (setq erc-chanlist-highlight-overlay - (make-overlay (point-min) (point-min))) - ;; Detach it from the buffer. - (delete-overlay erc-chanlist-highlight-overlay) - (overlay-put erc-chanlist-highlight-overlay - 'face erc-chanlist-highlight-face) - ;; Expressly put it at a higher priority than the text - ;; properties used for faces later on. Gnu emacs promises that - ;; right now overlays are higher priority than text properties, - ;; but why take chances? - (overlay-put erc-chanlist-highlight-overlay 'priority 1)) - (move-overlay erc-chanlist-highlight-overlay (point) (1+ (point-at-eol)))) - -(defun erc-chanlist-dehighlight-line () - "Remove the line highlighting." - (delete-overlay erc-chanlist-highlight-overlay)) - -(defun erc-prettify-channel-list () - "Make the channel list buffer look pretty. -When this function runs, the current buffer must be the channel -list buffer, or it does nothing." - (if (eq major-mode 'erc-chanlist-mode) - (save-excursion - (let ((inhibit-read-only t)) - (goto-char (point-min)) - (when (search-forward-regexp "^-------" nil t) - (add-text-properties - (point-min) (1+ (point-at-eol)) '(face erc-chanlist-header-face)) - (forward-line 1)) - - (while (not (eobp)) - (add-text-properties - (point) (1+ (point-at-eol)) '(face erc-chanlist-odd-line-face)) - (forward-line 1) - (unless (eobp) - (add-text-properties - (point) (1+ (point-at-eol)) '(face erc-chanlist-even-line-face))) - (forward-line 1)))))) - -(defun erc-chanlist-toggle-sort-state () - "Toggle the channel list buffer sorting method. -Either sort by channel names or by number of users in each channel." - (interactive) - (let ((inhibit-read-only t) - (sort-fold-case t)) - (save-excursion - (goto-char (point-min)) - (search-forward-regexp "^-----" nil t) - (forward-line 1) - (unless (eobp) - (if (eq erc-chanlist-sort-state 'channel) - (progn - (sort-numeric-fields 2 (point) (point-max)) - (reverse-region (point) (point-max)) - (setq erc-chanlist-sort-state 'users)) - (sort-lines nil (point) (point-max)) - (setq erc-chanlist-sort-state 'channel)) - - (goto-char (point-min)) - (if (search-forward-regexp "^[0-9]+ channels (sorted by \\(.*\\)).$" - nil t) - (replace-match (if (eq erc-chanlist-sort-state 'channel) - "channel name" - "number of users") - nil nil nil 1)) - - (goto-char (point-min)) - (search-forward-regexp "^-----" nil t) - (forward-line 1) - (recenter -1) - - (erc-prettify-channel-list))))) - -(defun erc-chanlist-quit () - "Quit Chanlist mode. -Kill the channel list buffer, window, and frame (if there's a frame -devoted to the channel list)." - (interactive) - (kill-buffer (current-buffer)) - (if (eq (selected-frame) erc-chanlist-frame) - (delete-frame) - (delete-window))) - -(defun erc-chanlist-join-channel () - "Join the channel listed on the current line of the channel list buffer. -Private channels, which are shown as asterisks (*), are ignored." - (interactive) - (save-excursion - (beginning-of-line) - (when (looking-at erc-chanlist-channel-line-regexp) - (let ((channel-name (match-string 1))) - (when (and (stringp channel-name) - (not (string= channel-name "*"))) - (run-at-time 0.5 nil 'erc-join-channel channel-name)))))) - -(provide 'erc-list) - -;;; erc-list.el ends here -;; -;; Local Variables: -;; indent-tabs-mode: t -;; tab-width: 8 -;; End: - -;; arch-tag: 4a13196a-a61b-465a-9926-044dfbc7e5ff diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index 5d43baab6c9..b0622b99443 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -266,8 +266,8 @@ be printed just before the window-width." (indent-to pos) (setq from (point)) (insert string)) - (erc-put-text-property from (1+ (point)) 'field 'erc-timestamp) - (erc-put-text-property from (1+ (point)) 'rear-nonsticky t) + (erc-put-text-property from (point) 'field 'erc-timestamp) + (erc-put-text-property from (point) 'rear-nonsticky t) (when erc-timestamp-intangible (erc-put-text-property from (1+ (point)) 'intangible t))))) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index a40da6f62c0..7de2828b86d 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2,7 +2,6 @@ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. -;; Copyright (C) 2004 Brian Palmer ;; Author: Alexander L. Belikoff (alexander@belikoff.net) ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), @@ -1669,22 +1668,25 @@ If `erc-track-mode' is in enabled, put the last element of Due to some yet unresolved reason, global function `iswitchb-mode' needs to be active for this function to work." (interactive "P") - (eval-and-compile + (eval-when-compile (require 'iswitchb)) - (let ((iswitchb-make-buflist-hook - (lambda () - (setq iswitchb-temp-buflist - (mapcar 'buffer-name - (erc-buffer-list - nil - (when arg erc-server-process))))))) - (switch-to-buffer - (iswitchb-read-buffer - "Switch-to: " - (if (boundp 'erc-modified-channels-alist) - (buffer-name (caar (last erc-modified-channels-alist))) - nil) - t)))) + (let ((enabled iswitchb-mode)) + (or enabled (iswitchb-mode 1)) + (let ((iswitchb-make-buflist-hook + (lambda () + (setq iswitchb-temp-buflist + (mapcar 'buffer-name + (erc-buffer-list + nil + (when arg erc-server-process))))))) + (switch-to-buffer + (iswitchb-read-buffer + "Switch-to: " + (if (boundp 'erc-modified-channels-alist) + (buffer-name (caar (last erc-modified-channels-alist))) + nil) + t))) + (or enabled (iswitchb-mode -1)))) (defun erc-channel-list (proc) "Return a list of channel buffers. @@ -1761,7 +1763,7 @@ all channel buffers on all servers." (defcustom erc-modules '(netsplit fill button match track completion readonly ring autojoin noncommands irccontrols - stamp list) + stamp) "A list of modules which ERC should enable. If you set the value of this without using `customize' remember to call \(erc-update-modules) after you change it. When using `customize', modules @@ -1792,7 +1794,6 @@ removed from the list will be disabled." (const :tag "Launch an identd server on port 8113" identd) (const :tag "Highlight or remove IRC control characters" irccontrols) - (const :tag "List channels in a separate buffer" list) (const :tag "Save buffers in logs" log) (const :tag "Highlight pals, fools, and other keywords" match) (const :tag "Detect netsplits" netsplit) diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el index 30b7f69cc38..96ec9d5e025 100644 --- a/lisp/eshell/em-alias.el +++ b/lisp/eshell/em-alias.el @@ -1,6 +1,6 @@ ;;; em-alias.el --- creation and management of command aliases -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el index 18f7cd84c04..382964f304d 100644 --- a/lisp/eshell/em-banner.el +++ b/lisp/eshell/em-banner.el @@ -1,6 +1,6 @@ ;;; em-banner.el --- sample module that displays a login banner -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el index c942b3c6913..bcc1ef80f91 100644 --- a/lisp/eshell/em-basic.el +++ b/lisp/eshell/em-basic.el @@ -1,6 +1,6 @@ ;;; em-basic.el --- basic shell builtin commands -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 19b1ad34569..50767a4a482 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -1,6 +1,6 @@ ;;; em-cmpl.el --- completion using the TAB key -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 12e84b5403f..dfcf9836061 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -1,6 +1,6 @@ ;;; em-dirs.el --- directory navigation commands -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index c700d5d7f6e..bb9abc8aaa8 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -1,6 +1,6 @@ ;;; em-glob.el --- extended file name globbing -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 66356c11925..24730f889f1 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -1,6 +1,6 @@ ;;; em-hist.el --- history list management -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index f705ca0e375..68e7caec0b0 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -1,6 +1,6 @@ ;;; em-ls.el --- implementation of ls in Lisp -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index a506bc03b2a..6a03a689a9f 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -1,6 +1,6 @@ ;;; em-pred.el --- argument predicates and modifiers (ala zsh) -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el index e55008fe2e8..8476e64fc7a 100644 --- a/lisp/eshell/em-prompt.el +++ b/lisp/eshell/em-prompt.el @@ -1,6 +1,6 @@ ;;; em-prompt.el --- command prompts -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index 98627be2363..65ca9676d55 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el @@ -1,6 +1,6 @@ ;;; em-rebind.el --- rebind keys when point is at current input -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index 782d70bb864..356fe76961e 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el @@ -1,6 +1,6 @@ ;;; em-script.el --- Eshell script files -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el index 65a3280d34e..5537d1c72f1 100644 --- a/lisp/eshell/em-smart.el +++ b/lisp/eshell/em-smart.el @@ -1,6 +1,6 @@ ;;; em-smart.el --- smart display of output -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index a91eb044987..af6aa66c328 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el @@ -1,6 +1,6 @@ ;;; em-term.el --- running visual commands -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el index d53d67314a0..8b77186f46a 100644 --- a/lisp/eshell/em-xtra.el +++ b/lisp/eshell/em-xtra.el @@ -1,6 +1,6 @@ ;;; em-xtra.el --- extra alias functions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index 5f636c66611..1b01501fb61 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -1,6 +1,6 @@ ;;; esh-arg.el --- argument processing -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index aad62bfc7dc..6c698c79393 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1,6 +1,6 @@ ;;; esh-cmd.el --- command invocation -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 9f77f1e2868..f0aa026d8e4 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -1,6 +1,6 @@ ;;; esh-ext.el --- commands external to Eshell -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index 19f90e67f92..18dcb87b9ee 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -1,6 +1,6 @@ ;;; esh-io.el --- I/O management -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el index d0d9f85ece7..44c8935af28 100644 --- a/lisp/eshell/esh-maint.el +++ b/lisp/eshell/esh-maint.el @@ -1,6 +1,6 @@ ;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*- -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index d2f4f76cf43..dc9f125aa65 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -1,6 +1,6 @@ ;;; esh-opt.el --- command options processing -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 379ac972206..7d8c66c1c53 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -1,6 +1,6 @@ ;;; esh-proc.el --- process management -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el index 5aad4126f91..d3f20c32274 100644 --- a/lisp/eshell/esh-test.el +++ b/lisp/eshell/esh-test.el @@ -1,6 +1,6 @@ ;;; esh-test.el --- Eshell test suite -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index 2bebb6a79cc..5f21eb13fdf 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -1,6 +1,6 @@ ;;; esh-var.el --- handling of variables -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index cfc2f05b931..2a254e045ba 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -1,6 +1,6 @@ ;;; eshell.el --- the Emacs command shell -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/expand.el b/lisp/expand.el index c67ed2cab77..12e0433b358 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -1,6 +1,6 @@ ;;; expand.el --- make abbreviations more usable -;; Copyright (C) 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org> diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 3db19342304..f767c8d4e26 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -132,6 +132,15 @@ just before \"Other\" at the end." :type 'boolean :group 'facemenu) +(defvar facemenu-unlisted-faces + `(modeline region secondary-selection highlight scratch-face + ,(purecopy "^font-lock-") ,(purecopy "^gnus-") ,(purecopy "^message-") + ,(purecopy "^ediff-") ,(purecopy "^term-") ,(purecopy "^vc-") + ,(purecopy "^widget-") ,(purecopy "^custom-") ,(purecopy "^vm-")) + "*List of faces that are of no interest to the user.") +(make-obsolete-variable 'facemenu-unlisted-faces 'facemenu-listed-faces + "since 22.1,\nand has no effect on the Face menu") + (defcustom facemenu-listed-faces nil "*List of faces to include in the Face menu. Each element should be a symbol, the name of a face. diff --git a/lisp/ffap.el b/lisp/ffap.el index 686d761eb4d..a36ba58e577 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -1,6 +1,6 @@ ;;; ffap.el --- find file (or url) at point -;; Copyright (C) 1995, 1996, 1997, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu> diff --git a/lisp/filecache.el b/lisp/filecache.el index 48ca2206386..27ecd1c14cd 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -4,7 +4,7 @@ ;; Created: Sun Nov 10 1996 ;; Keywords: convenience ;; -;; Copyright (C) 1996, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/files.el b/lisp/files.el index 75aa46089c8..0ce07562505 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1695,6 +1695,16 @@ This function ensures that none of these modifications will take place." (if (file-directory-p filename) (signal 'file-error (list "Opening input file" "file is a directory" filename))) + ;; Check whether the file is uncommonly large (see find-file-noselect): + (let (size) + (when (and large-file-warning-threshold + (setq size (nth 7 (file-attributes filename))) + (> size large-file-warning-threshold) + (not (y-or-n-p + (format "File %s is large (%dMB), really insert? " + (file-name-nondirectory filename) + (/ size 1048576))))) + (error "Aborted"))) (let* ((buffer (find-buffer-visiting (abbreviate-file-name (file-truename filename)) #'buffer-modified-p)) (tem (funcall insert-func filename))) @@ -1866,6 +1876,16 @@ in that case, this function acts as if `enable-local-variables' were t." (if (fboundp 'ucs-set-table-for-input) ; don't lose when building (ucs-set-table-for-input))) +(defcustom auto-mode-case-fold nil + "Non-nil means to try second pass through `auto-mode-alist'. +This means that if the first case-sensitive search through the alist fails +to find a matching major mode, a second case-insensitive search is made. +On systems with case-insensitive file names, this variable is ignored, +since only a single case-insensitive search through the alist is made." + :group 'files + :version "22.1" + :type 'boolean) + (defvar auto-mode-alist ;; Note: The entries for the modes defined in cc-mode.el (c-mode, ;; c++-mode, java-mode and more) are added through autoload @@ -2105,7 +2125,8 @@ of the regular expression. The mode is then determined as the mode associated with that interpreter in `interpreter-mode-alist'.") (defvar magic-mode-alist - `(;; The < comes before the groups (but the first) to reduce backtracking. + `((image-type-auto-detected-p . image-mode) + ;; The < comes before the groups (but the first) to reduce backtracking. ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff. ;; We use [ \t\n] instead of `\\s ' to make regex overflow less likely. (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") @@ -2124,13 +2145,15 @@ associated with that interpreter in `interpreter-mode-alist'.") ("%![^V]" . ps-mode) ("# xmcd " . conf-unix-mode)) "Alist of buffer beginnings vs. corresponding major mode functions. -Each element looks like (REGEXP . FUNCTION). After visiting a file, -if REGEXP matches the text at the beginning of the buffer, -`normal-mode' will call FUNCTION rather than allowing `auto-mode-alist' -to decide the buffer's major mode. +Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). +After visiting a file, if REGEXP matches the text at the beginning of the +buffer, or calling MATCH-FUNCTION returns non-nil, `normal-mode' will +call FUNCTION rather than allowing `auto-mode-alist' to decide the buffer's +major mode. If FUNCTION is nil, then it is not called. (That is a way of saying \"allow `auto-mode-alist' to decide for these files.\")") +(put 'magic-mode-alist 'risky-local-variable t) (defvar magic-mode-regexp-match-limit 4000 "Upper limit on `magic-mode-alist' regexp matches.") @@ -2214,7 +2237,9 @@ only set the major mode, if that would change it." (+ (point-min) magic-mode-regexp-match-limit))) (assoc-default nil magic-mode-alist (lambda (re dummy) - (looking-at re)))))) + (if (functionp re) + (funcall re) + (looking-at re))))))) (set-auto-mode-0 done keep-mode-if-same) ;; Compare the filename against the entries in auto-mode-alist. (if buffer-file-name @@ -2223,15 +2248,29 @@ only set the major mode, if that would change it." (setq name (file-name-sans-versions name)) (while name ;; Find first matching alist entry. - (let ((case-fold-search - (memq system-type '(vax-vms windows-nt cygwin)))) - (if (and (setq mode (assoc-default name auto-mode-alist - 'string-match)) - (consp mode) - (cadr mode)) - (setq mode (car mode) - name (substring name 0 (match-beginning 0))) - (setq name))) + (setq mode + (if (memq system-type '(vax-vms windows-nt cygwin)) + ;; System is case-insensitive. + (let ((case-fold-search t)) + (assoc-default name auto-mode-alist + 'string-match)) + ;; System is case-sensitive. + (or + ;; First match case-sensitively. + (let ((case-fold-search nil)) + (assoc-default name auto-mode-alist + 'string-match)) + ;; Fallback to case-insensitive match. + (and auto-mode-case-fold + (let ((case-fold-search t)) + (assoc-default name auto-mode-alist + 'string-match)))))) + (if (and mode + (consp mode) + (cadr mode)) + (setq mode (car mode) + name (substring name 0 (match-beginning 0))) + (setq name)) (when mode (set-auto-mode-0 mode keep-mode-if-same))))))))) @@ -2917,7 +2956,7 @@ Interactively, confirmation is required unless you supply a prefix argument." (interactive (list (if buffer-file-name (read-file-name "Write file: " - nil nil nil nil) + nil nil nil nil) (read-file-name "Write file: " default-directory (expand-file-name (file-name-nondirectory (buffer-name)) @@ -3017,7 +3056,7 @@ BACKUPNAME is the backup file name, which is the old file renamed." (convert-standard-filename "~/%backup%~"))) (message "Cannot write backup file; backing up in %s" - (file-name-nondirectory backupname)) + backupname) (sleep-for 1) (backup-buffer-copy real-file-name backupname modes))) (setq buffer-backed-up t) @@ -3213,16 +3252,24 @@ doesn't exist, it is created." (defun make-backup-file-name-1 (file) "Subroutine of `make-backup-file-name' and `find-backup-file-name'." (let ((alist backup-directory-alist) - elt backup-directory) + elt backup-directory abs-backup-directory) (while alist (setq elt (pop alist)) (if (string-match (car elt) file) (setq backup-directory (cdr elt) alist nil))) - (if (and backup-directory (not (file-exists-p backup-directory))) + ;; If backup-directory is relative, it should be relative to the + ;; file's directory. By expanding explicitly here, we avoid + ;; depending on default-directory. + (if backup-directory + (setq abs-backup-directory + (expand-file-name backup-directory + (file-name-directory file)))) + (if (and abs-backup-directory (not (file-exists-p abs-backup-directory))) (condition-case nil - (make-directory backup-directory 'parents) - (file-error (setq backup-directory nil)))) + (make-directory abs-backup-directory 'parents) + (file-error (setq backup-directory nil + abs-backup-directory nil)))) (if (null backup-directory) file (if (file-name-absolute-p backup-directory) @@ -3253,9 +3300,7 @@ doesn't exist, it is created." (replace-regexp-in-string "!" "!!" file)) backup-directory)) (expand-file-name (file-name-nondirectory file) - (file-name-as-directory - (expand-file-name backup-directory - (file-name-directory file)))))))) + (file-name-as-directory abs-backup-directory)))))) (defun backup-file-name-p (file) "Return non-nil if FILE is a backup file name (numeric or not). diff --git a/lisp/find-dired.el b/lisp/find-dired.el index a2895133c27..027710f74c3 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -1,6 +1,6 @@ ;;; find-dired.el --- run a `find' command and dired the output -;; Copyright (C) 1992, 1994, 1995, 2000, 2002, 2003, 2004, +;; Copyright (C) 1992, 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org>, diff --git a/lisp/find-file.el b/lisp/find-file.el index 5618ba58dbe..505789e5146 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -4,7 +4,7 @@ ;; Maintainer: FSF ;; Keywords: c, matching, tools -;; Copyright (C) 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el index 5cedaa60e35..2dfd8d2a6c6 100644 --- a/lisp/find-lisp.el +++ b/lisp/find-lisp.el @@ -3,9 +3,8 @@ ;; Author: Peter Breton ;; Created: Fri Mar 26 1999 ;; Keywords: unix -;; Time-stamp: <2006-02-06 13:40:10 ttn> -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el index bfa86317809..f2a29cda43c 100644 --- a/lisp/flow-ctrl.el +++ b/lisp/flow-ctrl.el @@ -1,6 +1,6 @@ ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control -;; Copyright (C) 1990, 1991, 1994, 2002, 2003, 2004, +;; Copyright (C) 1990, 1991, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author Kevin Gallagher diff --git a/lisp/foldout.el b/lisp/foldout.el index 7666ee48bc7..540a1943271 100644 --- a/lisp/foldout.el +++ b/lisp/foldout.el @@ -1,6 +1,6 @@ ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk> diff --git a/lisp/format.el b/lisp/format.el index 66eca0c2ac2..73f48fba7cd 100644 --- a/lisp/format.el +++ b/lisp/format.el @@ -1,6 +1,6 @@ ;;; format.el --- read and save files in multiple formats -;; Copyright (C) 1994, 1995, 1997, 1999, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> diff --git a/lisp/forms-d2.el b/lisp/forms-d2.el index 63b47fc028d..883cfe14d7c 100644 --- a/lisp/forms-d2.el +++ b/lisp/forms-d2.el @@ -1,5 +1,8 @@ ;;; forms-d2.el --- demo forms-mode -*- no-byte-compile: t -*- +;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. + ;; Author: Johan Vromans <jvromans@squirrel.nl> ;; Created: 1989 diff --git a/lisp/forms.el b/lisp/forms.el index ab5e591938c..63e208a127f 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -1,6 +1,6 @@ ;;; forms.el --- Forms mode: edit a file as a form to fill in -;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2002, 2003, +;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Johan Vromans <jvromans@squirrel.nl> diff --git a/lisp/frame.el b/lisp/frame.el index c9b9b1ef7de..bac533ae86f 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -795,7 +795,7 @@ This variable does not have any effect on MS-Windows." (set-mouse-position (selected-frame) (1- (frame-width)) 0)))) (defun other-frame (arg) - "Select the ARG'th different visible frame on current display, and raise it. + "Select the ARGth different visible frame on current display, and raise it. All frames are arranged in a cyclic order. This command selects the frame ARG steps away in that order. A negative ARG moves in the opposite order. @@ -986,7 +986,7 @@ pixels) is kept by adjusting the numbers of the lines and columns." (defun set-frame-parameter (frame parameter value) "Set frame parameter PARAMETER to VALUE on FRAME. If FRAME is nil, it defaults to the selected frame. -See `modify-frame-parameters.'" +See `modify-frame-parameters'." (modify-frame-parameters frame (list (cons parameter value)))) (defun set-background-color (color-name) diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 609d076d8a2..d980a1ebc89 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1,6 +1,6 @@ ;;; generic-x.el --- A collection of generic modes -;; Copyright (C) 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 787a5d58c6f..b6b8b1b9bac 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,90 @@ +2006-12-30 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> + + * gnus-sum.el (gnus-summary-insert-dormant-articles): Fix typo in + message. + +2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> + + * nnimap.el (nnimap-expunge-search-string): Mention + nnimap-search-uids-not-since-is-evil in docstring. + +2006-12-28 Reiner Steib <Reiner.Steib@gmx.de> + + * spam.el: Revert to make-obsolete-variable because + define-obsolete-variable-alias is not supported in Emacs 21. + +2006-12-28 Daiki Ueno <ueno@unixuser.org> + + * gnus-sum.el (gnus-summary-next-article): Make sure we are in the + summary buffer. + +2006-12-27 Reiner Steib <Reiner.Steib@gmx.de> + + * spam.el (spam-ifile-path, spam-ifile-database-path) + (spam-bogofilter-path): Use define-obsolete-variable-alias instead of + make-obsolete-variable. + +2006-12-26 Reiner Steib <Reiner.Steib@gmx.de> + + * message.el (message-make-fqdn): Fix comment. + (message-bogus-system-names): Add ".local". + + * spam.el (spam-ifile-path, spam-ifile-program) + (spam-ifile-database-path, spam-ifile-database) + (spam-bogofilter-path, spam-bogofilter-program): Rename variables. + Don't use "path" inappropriately. + (spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc + strings. + (spam-check-ifile, spam-ifile-register-with-ifile) + (spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use + new variable names. + + * gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face) + (gnus-treat-display-smileys): Simplify using + gnus-image-type-available-p. + + * gnus-ems.el (gnus-image-type-available-p): Use display-images-p if + available. + +2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org> + + * nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded + one after turning on the buffer's multibyteness instead of decoding + them directly in the unibyte buffer that causes unexpected conversion + in Emacs 23 (unicode). + +2006-12-20 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-group.el (gnus-group-tool-bar-gnome): Exchange connect and + disconnect icons. Add help text. + +2006-12-13 Reiner Steib <Reiner.Steib@gmx.de> + + * legacy-gnus-agent.el: Add Copyright notice. + +2006-12-12 Chong Yidong <cyd@stupidchicken.com> + + * gnus-sum.el (gnus-make-thread-indent-array): Fix last change. + +2006-12-08 Chong Yidong <cyd@stupidchicken.com> + + * gnus-sum.el (gnus-make-thread-indent-array): New optional arg + specifying array size. + (gnus-summary-insert-line, gnus-summary-prepare-threads): Regrow indent + array if it is too small. + (gnus-sort-threads-recursive): Renamed from gnus-sort-thread-1. + (gnus-sort-threads-loop): New function. + +2006-12-06 Chris Moore <dooglus@gmail.com> (tiny change) + + * gnus-sum.el (gnus-sort-threads, gnus-summary-limit-children): + Use `max' to avoid the value of `max-lisp-eval-depth' decreasing. + +2006-12-04 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> + + * mm-url.el (mm-url-predefined-programs): Call curl with correct + options. + 2006-11-30 Katsumi Yamaoka <yamaoka@jpl.org> * mml2015.el (mml2015-pgg-clear-verify): Replace encode-coding-string @@ -1622,7 +1709,7 @@ whitespace removed in revision 7.8. Use concatenated string to protect trailing whitespace. -2005-10-27 Jouni K Seppanen <jks@iki.fi> (tiny change) +2005-10-27 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> * nnimap.el (nnimap-search-uids-not-since-is-evil): Add variable. (nnimap-request-expire-articles): Use it to avoid sending 'UID diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index f917d0cbf73..5f86d24e019 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -3726,7 +3726,8 @@ * gnus.el: Quassia Gnus v0.1 is released. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 14b4c23c38a..dcd6e8249b4 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -18857,7 +18857,8 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006 + Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el index 404aebbd921..53439d17091 100644 --- a/lisp/gnus/deuglify.el +++ b/lisp/gnus/deuglify.el @@ -1,7 +1,7 @@ ;;; deuglify.el --- deuglify broken Outlook (Express) articles -;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 2001, 2002 Raymond Scholz +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Raymond Scholz <rscholz@zonix.de> ;; Thomas Steffen (unwrapping algorithm, diff --git a/lisp/gnus/format-spec.el b/lisp/gnus/format-spec.el index d287cd4081f..e905e91c2e1 100644 --- a/lisp/gnus/format-spec.el +++ b/lisp/gnus/format-spec.el @@ -1,6 +1,6 @@ ;;; format-spec.el --- functions for formatting arbitrary formatting strings -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index cdb3c8950cc..9160f6f5002 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1325,12 +1325,11 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-display-x-face (and (not noninteractive) - (or (and (fboundp 'image-type-available-p) - (image-type-available-p 'xbm) - (string-match "^0x" (shell-command-to-string "uncompface")) - (executable-find "icontopbm")) - (and (featurep 'xemacs) - (featurep 'xface))) + (gnus-image-type-available-p 'xbm) + (if (featurep 'xemacs) + (featurep 'xface) + (and (string-match "^0x" (shell-command-to-string "uncompface")) + (executable-find "icontopbm"))) 'head) "Display X-Face headers. Valid values are nil, t, `head', `last', an integer or a predicate. @@ -1362,10 +1361,7 @@ See Info node `(gnus)Customizing Articles' and Info node (defcustom gnus-treat-display-face (and (not noninteractive) - (or (and (fboundp 'image-type-available-p) - (image-type-available-p 'png)) - (and (featurep 'xemacs) - (featurep 'png))) + (gnus-image-type-available-p 'png) 'head) "Display Face headers. Valid values are nil, t, `head', `last', an integer or a predicate. @@ -1378,12 +1374,7 @@ See Info node `(gnus)Customizing Articles' and Info node :type gnus-article-treat-head-custom) (put 'gnus-treat-display-face 'highlight t) -(defcustom gnus-treat-display-smileys - (if (or (and (featurep 'xemacs) - (featurep 'xpm)) - (and (fboundp 'image-type-available-p) - (image-type-available-p 'pbm))) - t nil) +(defcustom gnus-treat-display-smileys (gnus-image-type-available-p 'xpm) "Display smileys. Valid values are nil, t, `head', `last', an integer or a predicate. See Info node `(gnus)Customizing Articles' and Info node diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el index 91d6358d2ad..ba884185841 100644 --- a/lisp/gnus/gnus-async.el +++ b/lisp/gnus/gnus-async.el @@ -1,6 +1,6 @@ ;;; gnus-async.el --- asynchronous support for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-audio.el b/lisp/gnus/gnus-audio.el index be100195b84..a3192d84f65 100644 --- a/lisp/gnus/gnus-audio.el +++ b/lisp/gnus/gnus-audio.el @@ -1,6 +1,6 @@ ;;; gnus-audio.el --- Sound effects for Gnus -;; Copyright (C) 1996, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L. Baur <steve@miranova.com> diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el index fb28d6440fd..6df92620503 100644 --- a/lisp/gnus/gnus-demon.el +++ b/lisp/gnus/gnus-demon.el @@ -1,6 +1,6 @@ ;;; gnus-demon.el --- daemonic Gnus behaviour -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index bc2f096fd70..06d3d530df7 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -1,7 +1,7 @@ ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1999, 2000, 2001 Didier Verna. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Didier Verna <didier@xemacs.org> ;; Maintainer: Didier Verna <didier@xemacs.org> diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el index 651237f1348..38420d51a18 100644 --- a/lisp/gnus/gnus-dup.el +++ b/lisp/gnus/gnus-dup.el @@ -1,6 +1,6 @@ ;;; gnus-dup.el --- suppression of duplicate articles in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el index 44f84237a4b..73bcf09f360 100644 --- a/lisp/gnus/gnus-ems.el +++ b/lisp/gnus/gnus-ems.el @@ -211,7 +211,10 @@ (defun gnus-image-type-available-p (type) (and (fboundp 'image-type-available-p) - (image-type-available-p type))) + (image-type-available-p type) + (if (fboundp 'display-images-p) + (display-images-p) + t))) (defun gnus-create-image (file &optional type data-p &rest props) (let ((face (plist-get props :face))) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index f004a043834..3fe8d71f512 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1018,9 +1018,11 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and '((gnus-group-post-news "mail/compose") ;; Some useful agent icons? I don't use the agent so agent users should ;; suggest useful commands: - (gnus-agent-toggle-plugged "connect" t - :visible (and gnus-agent (not gnus-plugged))) (gnus-agent-toggle-plugged "disconnect" t + :help "Gnus is currently unplugged. Click to work online." + :visible (and gnus-agent (not gnus-plugged))) + (gnus-agent-toggle-plugged "connect" t + :help "Gnus is currently plugged. Click to work offline." :visible (and gnus-agent gnus-plugged)) ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar) ;; should have a better help text. diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el index 90a4fcb593f..cf8d9bc431c 100644 --- a/lisp/gnus/gnus-kill.el +++ b/lisp/gnus/gnus-kill.el @@ -1,6 +1,6 @@ ;;; gnus-kill.el --- kill commands for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/gnus-mh.el b/lisp/gnus/gnus-mh.el index 34c310f3205..3c3dd501736 100644 --- a/lisp/gnus/gnus-mh.el +++ b/lisp/gnus/gnus-mh.el @@ -1,6 +1,6 @@ ;;; gnus-mh.el --- mh-e interface for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> diff --git a/lisp/gnus/gnus-move.el b/lisp/gnus/gnus-move.el index 8a27ccd5d7f..fafd266b81d 100644 --- a/lisp/gnus/gnus-move.el +++ b/lisp/gnus/gnus-move.el @@ -1,6 +1,6 @@ ;;; gnus-move.el --- commands for moving Gnus from one server to another -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-nocem.el b/lisp/gnus/gnus-nocem.el index e75b25282b0..cfdaf137087 100644 --- a/lisp/gnus/gnus-nocem.el +++ b/lisp/gnus/gnus-nocem.el @@ -1,6 +1,6 @@ ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/gnus-soup.el b/lisp/gnus/gnus-soup.el index bca59849766..31c721d9f1f 100644 --- a/lisp/gnus/gnus-soup.el +++ b/lisp/gnus/gnus-soup.el @@ -1,6 +1,6 @@ ;;; gnus-soup.el --- SOUP packet writing support for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@iesd.auc.dk> diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 0e43c78e3a8..54745511129 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -3343,16 +3343,17 @@ buffer that was in action when the last article was fetched." t (not (cdr (gnus-data-find-list article))))) -(defun gnus-make-thread-indent-array () - (let ((n 200)) - (unless (and gnus-thread-indent-array - (= gnus-thread-indent-level gnus-thread-indent-array-level)) - (setq gnus-thread-indent-array (make-vector 201 "") - gnus-thread-indent-array-level gnus-thread-indent-level) - (while (>= n 0) - (aset gnus-thread-indent-array n - (make-string (* n gnus-thread-indent-level) ? )) - (setq n (1- n)))))) +(defun gnus-make-thread-indent-array (&optional n) + (when (or n + (progn (setq n 200) nil) + (null gnus-thread-indent-array) + (/= gnus-thread-indent-level gnus-thread-indent-array-level)) + (setq gnus-thread-indent-array (make-vector (1+ n) "") + gnus-thread-indent-array-level gnus-thread-indent-level) + (while (>= n 0) + (aset gnus-thread-indent-array n + (make-string (* n gnus-thread-indent-level) ? )) + (setq n (1- n))))) (defun gnus-update-summary-mark-positions () "Compute where the summary marks are to go." @@ -3451,6 +3452,9 @@ buffer that was in action when the last article was fetched." gnus-tmp-expirable gnus-tmp-subject-or-nil &optional gnus-tmp-dummy gnus-tmp-score gnus-tmp-process) + (if (>= gnus-tmp-level (length gnus-thread-indent-array)) + (gnus-make-thread-indent-array (max (* 2 (length gnus-thread-indent-array)) + gnus-tmp-level))) (let* ((gnus-tmp-indentation (aref gnus-thread-indent-array gnus-tmp-level)) (gnus-tmp-lines (mail-header-lines gnus-tmp-header)) (gnus-tmp-score (or gnus-tmp-score gnus-summary-default-score 0)) @@ -4549,23 +4553,46 @@ If LINE, insert the rebuilt thread starting on line LINE." (1+ (gnus-point-at-eol)) (gnus-delete-line))))))) -(defun gnus-sort-threads-1 (threads func) +(defun gnus-sort-threads-recursive (threads func) (sort (mapcar (lambda (thread) (cons (car thread) (and (cdr thread) - (gnus-sort-threads-1 (cdr thread) func)))) + (gnus-sort-threads-recursive (cdr thread) func)))) threads) func)) +(defun gnus-sort-threads-loop (threads func) + (let* ((superthread (cons nil threads)) + (stack (list (cons superthread threads))) + remaining-threads thread) + (while stack + (setq remaining-threads (cdr (car stack))) + (if remaining-threads + (progn (setq thread (car remaining-threads)) + (setcdr (car stack) (cdr remaining-threads)) + (if (cdr thread) + (push (cons thread (cdr thread)) stack))) + (setq thread (caar stack)) + (setcdr thread (sort (cdr thread) func)) + (pop stack))) + (cdr superthread))) + (defun gnus-sort-threads (threads) "Sort THREADS." (if (not gnus-thread-sort-functions) threads (gnus-message 8 "Sorting threads...") - (let ((max-lisp-eval-depth 5000)) - (prog1 (gnus-sort-threads-1 - threads - (gnus-make-sort-function gnus-thread-sort-functions)) - (gnus-message 8 "Sorting threads...done"))))) + (prog1 + (condition-case nil + (let ((max-lisp-eval-depth (max max-lisp-eval-depth 5000))) + (gnus-sort-threads-recursive + threads (gnus-make-sort-function gnus-thread-sort-functions))) + ;; Even after binding max-lisp-eval-depth, the recursive + ;; sorter might fail for very long threads. In that case, + ;; try using a (less well-tested) non-recursive sorter. + (error (gnus-sort-threads-loop + threads (gnus-make-sort-function + gnus-thread-sort-functions)))) + (gnus-message 8 "Sorting threads...done")))) (defun gnus-sort-articles (articles) "Sort ARTICLES." @@ -4990,6 +5017,10 @@ or a straight list of headers." gnus-tmp-closing-bracket ?\>) (setq gnus-tmp-opening-bracket ?\[ gnus-tmp-closing-bracket ?\])) + (if (>= gnus-tmp-level (length gnus-thread-indent-array)) + (gnus-make-thread-indent-array + (max (* 2 (length gnus-thread-indent-array)) + gnus-tmp-level))) (setq gnus-tmp-indentation (aref gnus-thread-indent-array gnus-tmp-level) @@ -7302,6 +7333,9 @@ If UNREAD, only unread articles are selected. If SUBJECT, only articles with SUBJECT are selected. If BACKWARD, the previous article is selected instead of the next." (interactive "P") + ;; Make sure we are in the summary buffer. + (unless (eq major-mode 'gnus-summary-mode) + (set-buffer gnus-summary-buffer)) (cond ;; Is there such an article? ((and (gnus-summary-search-forward unread subject backward) @@ -7956,7 +7990,7 @@ article." (interactive) (let ((gnus-verbose (max 6 gnus-verbose))) (if (not gnus-newsgroup-dormant) - (gnus-message 3 "No cached articles for this group") + (gnus-message 3 "No dormant articles for this group") (gnus-summary-goto-subjects gnus-newsgroup-dormant)))) (defun gnus-summary-limit-include-dormant () @@ -8165,7 +8199,7 @@ fetch-old-headers verbiage, and so on." ;; will really go down to a leaf article first, before slowly ;; working its way up towards the root. (when thread - (let* ((max-lisp-eval-depth 5000) + (let* ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth)) (children (if (cdr thread) (apply '+ (mapcar 'gnus-summary-limit-children diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el index 47be2ed97f5..f7a3d1779d5 100644 --- a/lisp/gnus/gnus-undo.el +++ b/lisp/gnus/gnus-undo.el @@ -1,6 +1,6 @@ ;;; gnus-undo.el --- minor mode for undoing in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/legacy-gnus-agent.el b/lisp/gnus/legacy-gnus-agent.el index 50675b0ba27..cc8e4e370f4 100644 --- a/lisp/gnus/legacy-gnus-agent.el +++ b/lisp/gnus/legacy-gnus-agent.el @@ -1,10 +1,39 @@ +;;; gnus-agent.el --- Legacy unplugged support for Gnus + +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. + +;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com> +;; Keywords: news + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Commentary: + +;; Conversion functions for the Agent. + +;;; Code: (require 'gnus-start) (require 'gnus-util) (require 'gnus-range) (require 'gnus-agent) -; Oort Gnus v0.08 - This release updated agent to no longer use -; history file and to support a compressed alist. +;; Oort Gnus v0.08 - This release updated agent to no longer use +;; history file and to support a compressed alist. (defvar gnus-agent-compressed-agentview-search-only nil) @@ -224,4 +253,7 @@ possible that the hook was persistently saved." ;; the .newsrc.eld file. (gnus-convert-mark-converter-prompt 'gnus-agent-unhook-expire-days t) -;;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a +(provide 'legacy-gnus-agent) + +;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a +;;; legacy-gnus-agent.el ends here diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el index 3c1aa8111c2..ae3bcb7270e 100644 --- a/lisp/gnus/mail-parse.el +++ b/lisp/gnus/mail-parse.el @@ -1,6 +1,6 @@ ;;; mail-parse.el --- Interface functions for parsing mail -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/mail-prsvr.el b/lisp/gnus/mail-prsvr.el index 144d61eb6a3..9cb214d50a4 100644 --- a/lisp/gnus/mail-prsvr.el +++ b/lisp/gnus/mail-prsvr.el @@ -1,6 +1,6 @@ ;;; mail-prsvr.el --- Interface variables for parsing mail -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index a3d0298ce0e..f7d876c120f 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1579,7 +1579,7 @@ functionality to work." (defvar message-send-mail-real-function nil "Internal send mail function.") -(defvar message-bogus-system-names "^localhost\\." +(defvar message-bogus-system-names "^localhost\\.\\|\\.local$" "The regexp of bogus system names.") (defcustom message-valid-fqdn-regexp @@ -5000,8 +5000,8 @@ give as trustworthy answer as possible." (stringp message-user-fqdn) (string-match message-valid-fqdn-regexp message-user-fqdn) (not (string-match message-bogus-system-names message-user-fqdn))) + ;; `message-user-fqdn' seems to be valid message-user-fqdn) - ;; `message-user-fqdn' seems to be valid ((and (string-match message-valid-fqdn-regexp system-name) (not (string-match message-bogus-system-names system-name))) ;; `system-name' returned the right result. diff --git a/lisp/gnus/messcompat.el b/lisp/gnus/messcompat.el index f7b06f69029..1c56d5d8cf0 100644 --- a/lisp/gnus/messcompat.el +++ b/lisp/gnus/messcompat.el @@ -1,6 +1,6 @@ ;;; messcompat.el --- making message mode compatible with mail mode -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index 5e228f0af72..70584bdf50d 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -64,7 +64,7 @@ '((wget "wget" "--user-agent=mm-url" "-q" "-O" "-") (w3m "w3m" "-dump_source") (lynx "lynx" "-source") - (curl "curl" "--silent" "--user-agent mm-url" "--location"))) + (curl "curl" "--silent" "--user-agent" "mm-url" "--location"))) (defcustom mm-url-program (cond diff --git a/lisp/gnus/nndir.el b/lisp/gnus/nndir.el index ec47c94749f..e821107cb48 100644 --- a/lisp/gnus/nndir.el +++ b/lisp/gnus/nndir.el @@ -1,6 +1,6 @@ ;;; nndir.el --- single directory newsgroup access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index bada9da6891..5c0777531c5 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -375,7 +375,10 @@ and the second %s is replaced by a date criterium. One useful (and perhaps the only useful) value to change this to would be `UID %s NOT SENTSINCE %s' to make nnimap use the Date: header instead of the internal date of messages. See section 6.4.4 of RFC -2060 for more information on valid strings.") +2060 for more information on valid strings. + +However, if `nnimap-search-uids-not-since-is-evil' is true, this +variable has no effect since the search logic is reversed.") (defvoo nnimap-importantize-dormant t "If non-nil, mark \"dormant\" articles as \"ticked\" for other IMAP clients. diff --git a/lisp/gnus/nnkiboze.el b/lisp/gnus/nnkiboze.el index b1fbc1f3d1d..dd4434553e6 100644 --- a/lisp/gnus/nnkiboze.el +++ b/lisp/gnus/nnkiboze.el @@ -1,6 +1,6 @@ ;;; nnkiboze.el --- select virtual news access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/nnlistserv.el b/lisp/gnus/nnlistserv.el index 3ee8f4200a4..2c77b028bb5 100644 --- a/lisp/gnus/nnlistserv.el +++ b/lisp/gnus/nnlistserv.el @@ -1,6 +1,6 @@ ;;; nnlistserv.el --- retrieving articles via web mailing list archives -;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 318560179f5..f21fd74d138 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -418,8 +418,10 @@ otherwise return nil." (nnheader-remove-cr-followed-by-lf) ;; Decode text according to the encoding attribute. (when (setq cs (nnrss-get-encoding)) - (mm-decode-coding-region (point-min) (point-max) cs) - (mm-enable-multibyte)) + (insert (prog1 + (mm-decode-coding-string (buffer-string) cs) + (erase-buffer) + (mm-enable-multibyte)))) (goto-char (point-min)) ;; Because xml-parse-region can't deal with anything that isn't diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el index 8de0c17c708..329b35ad867 100644 --- a/lisp/gnus/nnspool.el +++ b/lisp/gnus/nnspool.el @@ -1,7 +1,7 @@ ;;; nnspool.el --- spool access for GNU Emacs ;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/nnwarchive.el b/lisp/gnus/nnwarchive.el index 13a22419672..c110553a854 100644 --- a/lisp/gnus/nnwarchive.el +++ b/lisp/gnus/nnwarchive.el @@ -1,6 +1,6 @@ ;;; nnwarchive.el --- interfacing with web archives -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el index aac75758c05..527769d4c83 100644 --- a/lisp/gnus/rfc1843.el +++ b/lisp/gnus/rfc1843.el @@ -1,6 +1,6 @@ ;;; rfc1843.el --- HZ (rfc1843) decoding -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu> diff --git a/lisp/gnus/rfc2045.el b/lisp/gnus/rfc2045.el index f38ec0548fe..d41af595c94 100644 --- a/lisp/gnus/rfc2045.el +++ b/lisp/gnus/rfc2045.el @@ -1,6 +1,6 @@ ;;; rfc2045.el --- Functions for decoding rfc2045 headers -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index 40b10c07eb4..4fd60ed8f74 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -1,6 +1,6 @@ ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/rfc2104.el b/lisp/gnus/rfc2104.el index 87a2167ec42..e24506ef363 100644 --- a/lisp/gnus/rfc2104.el +++ b/lisp/gnus/rfc2104.el @@ -1,6 +1,6 @@ ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson <jas@pdc.kth.se> diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el index 284c95fc151..b054b1f9282 100644 --- a/lisp/gnus/rfc2231.el +++ b/lisp/gnus/rfc2231.el @@ -1,6 +1,6 @@ ;;; rfc2231.el --- Functions for decoding rfc2231 headers -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index 047035536f2..589b2b0a619 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -351,14 +351,18 @@ All unmarked article in such group receive the spam mark on group entry." "Spam ifile configuration." :group 'spam) -(defcustom spam-ifile-path (executable-find "ifile") - "File path of the ifile executable program." +(make-obsolete-variable 'spam-ifile-path 'spam-ifile-program) +;; "22.1" ;; Gnus 5.10.9 +(defcustom spam-ifile-program (executable-find "ifile") + "Name of the ifile program." :type '(choice (file :tag "Location of ifile") (const :tag "ifile is not installed")) :group 'spam-ifile) -(defcustom spam-ifile-database-path nil - "File path of the ifile database." +(make-obsolete-variable 'spam-ifile-database-path 'spam-ifile-database) +;; "22.1" ;; Gnus 5.10.9 +(defcustom spam-ifile-database nil + "File name of the ifile database." :type '(choice (file :tag "Location of the ifile database") (const :tag "Use the default")) :group 'spam-ifile) @@ -386,8 +390,10 @@ your main source of newsgroup names." "Spam bogofilter configuration." :group 'spam) -(defcustom spam-bogofilter-path (executable-find "bogofilter") - "File path of the Bogofilter executable program." +(make-obsolete-variable 'spam-bogofilter-path 'spam-bogofilter-program) +;; "22.1" ;; Gnus 5.10.9 +(defcustom spam-bogofilter-program (executable-find "bogofilter") + "Name of the Bogofilter program." :type '(choice (file :tag "Location of bogofilter") (const :tag "Bogofilter is not installed")) :group 'spam-bogofilter) @@ -423,7 +429,8 @@ your main source of newsgroup names." :group 'spam-bogofilter) (defcustom spam-bogofilter-database-directory nil - "Directory path of the Bogofilter databases." + "Location of the Bogofilter database. +When nil, use the default location." :type '(choice (directory :tag "Location of the Bogofilter database directory") (const :tag "Use the default")) @@ -434,8 +441,8 @@ your main source of newsgroup names." :group 'spam) (defcustom spam-spamoracle-database nil - "Location of spamoracle database file. When nil, use the default -spamoracle database." + "Location of spamoracle database file. +When nil, use the default spamoracle database." :type '(choice (directory :tag "Location of spamoracle database file.") (const :tag "Use the default")) :group 'spam-spamoracle) @@ -1370,11 +1377,12 @@ functions") ;;; check the ifile backend; return nil if the mail was NOT classified ;;; as spam + (defun spam-get-ifile-database-parameter () - "Get the command-line parameter for ifile's database from - spam-ifile-database-path." - (if spam-ifile-database-path - (format "--db-file=%s" spam-ifile-database-path) + "Return the command-line parameter for ifile's database. +See `spam-ifile-database'." + (if spam-ifile-database + (format "--db-file=%s" spam-ifile-database) nil)) (defun spam-check-ifile () @@ -1390,7 +1398,7 @@ functions") (save-excursion (set-buffer article-buffer-name) (apply 'call-process-region - (point-min) (point-max) spam-ifile-path + (point-min) (point-max) spam-ifile-program nil temp-buffer-name nil "-c" (if db-param `(,db-param "-q") `("-q")))) ;; check the return now (we're back in the temp buffer) @@ -1418,7 +1426,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)." (when (stringp article-string) (insert article-string)))) (apply 'call-process-region - (point-min) (point-max) spam-ifile-path + (point-min) (point-max) spam-ifile-program nil nil nil add-or-delete-option category (if db `(,db "-h") `("-h")))))) @@ -1702,7 +1710,7 @@ REMOVE not nil, remove the ADDRESSES." (set-buffer article-buffer-name) (apply 'call-process-region (point-min) (point-max) - spam-bogofilter-path + spam-bogofilter-program nil temp-buffer-name nil (if db `("-d" ,db "-v") `("-v")))) (setq return (spam-check-bogofilter-headers score)))) @@ -1728,7 +1736,7 @@ REMOVE not nil, remove the ADDRESSES." (apply 'call-process-region (point-min) (point-max) - spam-bogofilter-path + spam-bogofilter-program nil nil nil switch (if db `("-d" ,db "-v") `("-v")))))))) diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index a9b64b4d1fc..229d6dca9f8 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -1,6 +1,6 @@ ;;; starttls.el --- STARTTLS functions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el index a1b7fdc6702..8c761602ce0 100644 --- a/lisp/gnus/utf7.el +++ b/lisp/gnus/utf7.el @@ -1,6 +1,6 @@ ;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: iso-8859-1;-*- -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Jon K Hellan <hellan@acm.org> diff --git a/lisp/help-fns.el b/lisp/help-fns.el index a105083aafe..d9ffcbf742f 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -400,7 +400,7 @@ face (according to `face-differs-from-default-p')." ;;;###autoload (defun variable-at-point (&optional any-symbol) - "Return the bound variable symbol found around point. + "Return the bound variable symbol found at or before point. Return 0 if there is no such symbol. If ANY-SYMBOL is non-nil, don't insist the symbol be bound." (or (condition-case () @@ -583,8 +583,11 @@ it is displayed along with the global value." (documentation-property alias 'variable-documentation)))) (unless (eq alias variable) (princ (format "\nThis variable is an alias for `%s'.\n" alias))) + (if (or obsolete safe-var) + (terpri)) + (when obsolete - (princ "\nThis variable is obsolete") + (princ "This variable is obsolete") (if (cdr obsolete) (princ (format " since %s" (cdr obsolete)))) (princ ";") (terpri) (princ (if (stringp (car obsolete)) (car obsolete) @@ -595,9 +598,8 @@ it is displayed along with the global value." (princ "if its value\nsatisfies the predicate ") (princ (if (byte-code-function-p safe-var) "which is byte-compiled expression.\n" - (format "`%s'.\n" safe-var))) - (terpri)) - (princ "Documentation:\n") + (format "`%s'.\n" safe-var)))) + (princ "\nDocumentation:\n") (princ (or doc "Not documented as a variable."))) ;; Make a link to customize if this variable can be customized. (if (custom-variable-p variable) diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 66a249795d7..971b97f71bb 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -1,6 +1,6 @@ ;;; help-macro.el --- makes command line help such as help-for-help -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lynn Slater <lrs@indetech.com> diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index d6408412c0b..cb79f673408 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -1,6 +1,6 @@ ;;; hilit-chg.el --- minor mode displaying buffer changes with special face -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Sharman <rsharman@pobox.com> diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index 92fb9083cd4..28cfcf3b4ed 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -1,6 +1,6 @@ ;;; hippie-exp.el --- expand text trying various ways to find its expansion -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Anders Holst <aho@sans.kth.se> diff --git a/lisp/ido.el b/lisp/ido.el index 0e18c4b5fde..e02028e526c 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1046,6 +1046,9 @@ so that it doesn't interfere with other minibuffer usage.") ;; Stores the current ido item type ('file, 'dir, 'buffer, or 'list). (defvar ido-cur-item) +;;; Stores the current default item +(defvar ido-default-item) + ;; Stores the current list of items that will be searched through. ;; The list is ordered, so that the most interesting item comes first, ;; although by default, the files visible in the current frame are put @@ -1566,7 +1569,8 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise." (define-key map [(meta down)] 'ido-next-work-directory) (define-key map [backspace] 'ido-delete-backward-updir) (define-key map "\d" 'ido-delete-backward-updir) - (define-key map [(meta backspace)] 'ido-delete-backward-word-updir) + (define-key map [remap backward-kill-word] 'ido-delete-backward-word-updir) ; M-DEL + (define-key map [(control backspace)] 'ido-up-directory) (define-key map "\C-l" 'ido-reread-directory) (define-key map [(meta ?d)] 'ido-wide-find-dir-or-delete-dir) @@ -2588,7 +2592,9 @@ C-x C-f ... C-d enter dired on current directory." "Toggle ignoring files specified with `ido-ignore-files'." (interactive) (if ido-directory-too-big - (setq ido-directory-too-big nil) + (progn + (message "Reading directory...") + (setq ido-directory-too-big nil)) (setq ido-process-ignore-lists (not ido-process-ignore-lists))) (setq ido-text-init ido-text) (setq ido-exit 'refresh) @@ -3576,6 +3582,11 @@ for first matching file." (/= (aref name 0) ?.))) (string-match re name)) (cond + ((and (eq ido-cur-item 'buffer) + (or (not (stringp ido-default-item)) + (not (string= name ido-default-item))) + (string= name (buffer-name ido-entry-buffer))) + (setq matches (cons item matches))) ((and full-re (string-match full-re name)) (setq full-matches (cons item full-matches))) ((and suffix-re (string-match suffix-re name)) @@ -3728,7 +3739,8 @@ for first matching file." (set-buffer temp-buf) (setq win (get-buffer-window temp-buf)) (if (pos-visible-in-window-p (point-max) win) - (if (or ido-completion-buffer-all-completions (boundp 'ido-completion-buffer-full)) + (if (or ido-completion-buffer-all-completions + (boundp 'ido-completion-buffer-full)) (set-window-start win (point-min)) (with-no-warnings (set (make-local-variable 'ido-completion-buffer-full) t)) @@ -3741,6 +3753,14 @@ for first matching file." (with-output-to-temp-buffer ido-completion-buffer (let ((completion-list (sort (cond + (ido-directory-too-big + (message "Reading directory...") + (setq ido-directory-too-big nil + ido-ignored-list nil + ido-cur-list (ido-all-completions) + ido-rescan t) + (ido-set-matches) + (or ido-matches ido-cur-list)) (ido-use-merged-list (ido-flatten-merged-list (or ido-matches ido-cur-list))) ((or full-list ido-completion-buffer-all-completions) diff --git a/lisp/ielm.el b/lisp/ielm.el index ff0de14c3b1..3e8921934ca 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -1,6 +1,6 @@ ;;; ielm.el --- interaction mode for Emacs Lisp -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: David Smith <maa036@lancaster.ac.uk> diff --git a/lisp/image.el b/lisp/image.el index b388396ded7..e70b9ec539e 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -35,11 +35,11 @@ (defconst image-type-header-regexps '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm) - ("\\`P[1-6]" . pbm) + ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm) ("\\`GIF8" . gif) - ("\\`\211PNG\r\n" . png) + ("\\`\x89PNG\r\n\x1a\n" . png) ("\\`[\t\n\r ]*#define" . xbm) - ("\\`\\(MM\0\\*\\|II\\*\0\\)" . tiff) + ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff) ("\\`[\t\n\r ]*%!PS" . postscript) ("\\`\xff\xd8" . (image-jpeg-p . jpeg))) "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types. @@ -63,6 +63,24 @@ a non-nil value, TYPE is the image's type.") When the name of an image file match REGEXP, it is assumed to be of image type IMAGE-TYPE.") +(defvar image-type-auto-detectable + '((pbm . t) + (xbm . t) + (bmp . maybe) + (gif . maybe) + (png . maybe) + (xpm . maybe) + (jpeg . maybe) + (tiff . maybe) + (postscript . nil)) + "Alist of (IMAGE-TYPE . AUTODETECT) pairs used to auto-detect image files. +\(See `image-type-auto-detected-p'). + +AUTODETECT can be + - t always auto-detect. + - nil never auto-detect. + - maybe auto-detect only if the image type is available + (see `image-type-available-p').") (defvar image-load-path nil "List of locations in which to search for image files. @@ -308,6 +326,7 @@ Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data." (error "Invalid image type `%s'" type)) type) + ;;;###autoload (defun image-type-available-p (type) "Return non-nil if image type TYPE is available. @@ -317,6 +336,20 @@ Image types are symbols like `xbm' or `jpeg'." ;;;###autoload +(defun image-type-auto-detected-p () + "Return t iff the current buffer contains an auto-detectable image. +Whether image types are auto-detectable or not depends on the setting +of the variable `image-type-auto-detectable'. + +This function is intended to be used from `magic-mode-alist' (which see)." + (let* ((type (image-type-from-buffer)) + (auto (and type (cdr (assq type image-type-auto-detectable))))) + (and auto + (or (eq auto t) + (image-type-available-p type))))) + + +;;;###autoload (defun create-image (file-or-data &optional type data-p &rest props) "Create an image. FILE-OR-DATA is an image file name or image data. diff --git a/lisp/imenu.el b/lisp/imenu.el index ed190c24e12..fc2a27e3095 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -1,6 +1,6 @@ ;;; imenu.el --- framework for mode-specific buffer indexes -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se> diff --git a/lisp/indent.el b/lisp/indent.el index 38b509b849c..6f715fdba64 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -50,7 +50,9 @@ Don't rebind TAB unless you really need to.") "*Controls the operation of the TAB key. If t, hitting TAB always just indents the current line. If nil, hitting TAB indents the current line if point is at the left margin - or in the line's indentation, otherwise it insert a \"real\" tab character." +or in the line's indentation, otherwise it insert a \"real\" TAB character. +Most programming language modes have their own variable to control this, +e.g., `c-tab-always-indent', and do not respect this variable." :group 'indent :type '(choice (const nil) (const t) (const always))) diff --git a/lisp/info.el b/lisp/info.el index 05c07220892..6d966da3317 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -145,7 +145,7 @@ The Lisp code is executed when the node is selected.") :type 'boolean :group 'info) -(defcustom Info-fontify-maximum-menu-size 100000 +(defcustom Info-fontify-maximum-menu-size 1000000 "*Maximum size of menu to fontify if `font-lock-mode' is non-nil." :type 'integer :group 'info) @@ -1551,6 +1551,8 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)." (node-regexp "Node: *\\([^,\n]*\\) *[,\n\t]")) (save-excursion (save-restriction + (or Info-tag-table-marker + (error "No Info tags found")) (if (marker-buffer Info-tag-table-marker) (let ((marker Info-tag-table-marker)) (set-buffer (marker-buffer marker)) @@ -2805,6 +2807,11 @@ Give an empty topic name to go to the Index node itself." (kill-buffer Info-complete-menu-buffer))))) (if (equal Info-current-file "dir") (error "The Info directory node has no index; use m to select a manual")) + ;; Strip leading colon in topic; index format does not allow them. + (if (and (stringp topic) + (> (length topic) 0) + (= (aref topic 0) ?:)) + (setq topic (substring topic 1))) (let ((orignode Info-current-node) (pattern (format "\n\\* +\\([^\n]*%s[^\n]*\\):[ \t]+\\([^\n]*\\)\\.\\(?:[ \t\n]*(line +\\([0-9]+\\))\\)?" (regexp-quote topic))) @@ -3932,7 +3939,6 @@ the variable `Info-file-list-for-emacs'." (goto-char (point-min)) (when (and (or not-fontified-p fontify-visited-p) (search-forward "\n* Menu:" nil t) - (not (Info-index-node)) ;; Don't take time to annotate huge menus (< (- (point-max) (point)) Info-fontify-maximum-menu-size)) (let ((n 0) diff --git a/lisp/informat.el b/lisp/informat.el index 96dc0180418..f75460778c0 100644 --- a/lisp/informat.el +++ b/lisp/informat.el @@ -1,6 +1,6 @@ ;;; informat.el --- info support functions package for Emacs -;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 0f2a5a99a1a..eab0d39f2fe 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -1,7 +1,9 @@ ;;; ccl.el --- CCL (Code Conversion Language) compiler -;; Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1998, 1999, 2000 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/characters.el b/lisp/international/characters.el index 3522b57d5d9..9f545b01231 100644 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@ -1,8 +1,9 @@ ;;; characters.el --- set syntax and category for multibyte characters -;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el index 994450b2a70..0baf2ff5099 100644 --- a/lisp/international/code-pages.el +++ b/lisp/international/code-pages.el @@ -1,7 +1,8 @@ ;;; code-pages.el --- coding systems for assorted codepages -*-coding: utf-8;-*- -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -;; Copyright (C) 2004, 2005 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el index e2499002a34..9c045545ea6 100644 --- a/lisp/international/codepage.el +++ b/lisp/international/codepage.el @@ -1,7 +1,7 @@ ;;; codepage.el --- MS-DOS/MS-Windows specific coding systems ;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. -;; Copyright (C) 2000 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el index 160dd8a8d68..a39daff888a 100644 --- a/lisp/international/encoded-kb.el +++ b/lisp/international/encoded-kb.el @@ -1,7 +1,9 @@ ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index c1193e094d8..5374842b649 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -1,7 +1,9 @@ ;;; fontset.el --- commands for handling fontset -;; Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el index 1d0d50b01ac..a002df6687b 100644 --- a/lisp/international/isearch-x.el +++ b/lisp/international/isearch-x.el @@ -1,7 +1,9 @@ ;;; isearch-x.el --- extended isearch handling commands -;; Copyright (C) 1997, 2001, 2004 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el index c1de1217133..1e0e129c3d9 100644 --- a/lisp/international/iso-ascii.el +++ b/lisp/international/iso-ascii.el @@ -1,6 +1,7 @@ ;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals -;; Copyright (C) 1987, 1995, 1998, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1995, 1998, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el index ade60793884..00631390579 100644 --- a/lisp/international/iso-cvt.el +++ b/lisp/international/iso-cvt.el @@ -1,8 +1,8 @@ ;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: iso-latin-1 -*- ;; This file was formerly called gm-lingo.el. -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at> ;; Keywords: tex, iso, latin, i18n diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el index b5fcd750d27..f39601f1f5a 100644 --- a/lisp/international/iso-transl.el +++ b/lisp/international/iso-transl.el @@ -1,7 +1,7 @@ ;;; iso-transl.el --- keyboard input definitions for ISO 8859-1 -*- coding: iso-8859-1 -*- ;; Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001 -;; Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el index eb9878e612b..ee0bf67a537 100644 --- a/lisp/international/ja-dic-cnv.el +++ b/lisp/international/ja-dic-cnv.el @@ -1,6 +1,7 @@ ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp -;; Copyright (C) 1995, 2000 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el index abf1572c9cd..31b92885e7b 100644 --- a/lisp/international/ja-dic-utl.el +++ b/lisp/international/ja-dic-utl.el @@ -1,6 +1,7 @@ ;;; ja-dic-utl.el --- utilities for handling Japanese dictionary (SKK-JISYO.L) -;; Copyright (C) 1995, 2000 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el index 9d2a03fd6f0..a452f53c5dc 100644 --- a/lisp/international/kinsoku.el +++ b/lisp/international/kinsoku.el @@ -1,7 +1,9 @@ ;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 2003 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el index 6da899af93a..4094538c9a0 100644 --- a/lisp/international/kkc.el +++ b/lisp/international/kkc.el @@ -1,7 +1,9 @@ ;;; kkc.el --- Kana Kanji converter -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2003 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/latin-1.el b/lisp/international/latin-1.el index 67aa56a2ffb..d5dad7fe83a 100644 --- a/lisp/international/latin-1.el +++ b/lisp/international/latin-1.el @@ -1,6 +1,7 @@ ;;; latin-1.el --- set up case-conversion and syntax tables for ISO Latin-1 -;; Copyright (C) 1988, 1997, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/international/latin-2.el b/lisp/international/latin-2.el index 0589dfaf987..ca831d02d75 100644 --- a/lisp/international/latin-2.el +++ b/lisp/international/latin-2.el @@ -1,6 +1,7 @@ ;;; latin-2.el --- set up case-conversion and syntax tables for ISO Latin-2 -;; Copyright (C) 1995, 1997, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Michael Gschwind (mike@vlsivie.tuwien.ac.at) ;; Maintainer: FSF diff --git a/lisp/international/latin-3.el b/lisp/international/latin-3.el index e36d12002dc..6f32d6ec628 100644 --- a/lisp/international/latin-3.el +++ b/lisp/international/latin-3.el @@ -1,6 +1,7 @@ ;;; latin-3.el --- set up case-conversion and syntax tables for ISO Latin-3 -;; Copyright (C) 1988, 1997, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1997, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Marko Rahamaa ;; Maintainer: FSF diff --git a/lisp/international/latin-4.el b/lisp/international/latin-4.el index bf3bd0b0848..5eb46259e29 100644 --- a/lisp/international/latin-4.el +++ b/lisp/international/latin-4.el @@ -1,6 +1,7 @@ ;;; latin-4.el --- set up case-conversion and syntax tables for ISO Latin-4 -;; Copyright (C) 1997, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Erik Naggum ;; Maintainer: FSF diff --git a/lisp/international/latin-5.el b/lisp/international/latin-5.el index 9fdd1767edf..f51f562a7ef 100644 --- a/lisp/international/latin-5.el +++ b/lisp/international/latin-5.el @@ -1,6 +1,7 @@ ;;; latin-5.el --- set up case-conversion and syntax tables for ISO latin-5 -;; Copyright (C) 1997, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Erik Naggum ;; Maintainer: FSF diff --git a/lisp/international/latin-8.el b/lisp/international/latin-8.el index 0922db3564c..31bb8ad57eb 100644 --- a/lisp/international/latin-8.el +++ b/lisp/international/latin-8.el @@ -1,6 +1,7 @@ ;;; latin-8.el --- set up case-conversion and syntax tables for ISO Latin-8 -;; Copyright (C) 1988, 1997, 1999, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1997, 1999, 2001, 2002, 2003, 2004, 2005 +;; 2006 Free Software Foundation, Inc. ;; Author: Dave Love ;; Maintainer: FSF diff --git a/lisp/international/latin-9.el b/lisp/international/latin-9.el index c716ee88d98..5bb65deab91 100644 --- a/lisp/international/latin-9.el +++ b/lisp/international/latin-9.el @@ -1,6 +1,7 @@ ;;; latin-9.el --- set up case-conversion and syntax tables for ISO Latin-9 -;; Copyright (C) 1988, 1997, 1999, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1997, 1999, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love ;; Maintainer: FSF diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el index e558c222afd..60edc2a826d 100644 --- a/lisp/international/latin1-disp.el +++ b/lisp/international/latin1-disp.el @@ -1,6 +1,7 @@ ;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 2cec516c1ce..65c3f6fe5ff 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1,8 +1,9 @@ ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*- -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 @@ -736,18 +737,18 @@ DEFAULT is the coding system to use by default in the query." (insert "\n") (fill-region-as-paragraph pos (point))) (when rejected - (insert "These safely encodes the target text, -but it is not recommended for encoding text in this context, + (insert "These safely encode the text in the buffer, +but are not recommended for encoding text in this context, e.g., for sending an email message.\n ") (dolist (x rejected) (princ " ") (princ x)) (insert "\n")) (when unsafe - (insert (if rejected "And the others" + (insert (if rejected "The other coding systems" "However, each of them") - " encountered these problematic characters:\n") + " encountered characters it couldn't encode:\n") (dolist (coding unsafe) - (insert (format " %s:" (car coding))) + (insert (format " %s cannot encode these:" (car coding))) (let ((i 0) (func1 #'(lambda (bufname pos) @@ -771,6 +772,7 @@ e.g., for sending an email message.\n ") (insert-text-button (cdr elt) :type 'help-xref + 'face 'link 'help-echo "mouse-2, RET: jump to this character" 'help-function func1 @@ -778,6 +780,7 @@ e.g., for sending an email message.\n ") (insert-text-button "..." :type 'help-xref + 'face 'link 'help-echo "mouse-2, RET: next unencodable character" 'help-function func2 @@ -786,19 +789,22 @@ e.g., for sending an email message.\n ") (setq i (1+ i)))) (insert "\n")) (insert "\ -The first problematic character is at point in the displayed buffer,\n" + +Click on a character to jump to the place it appears,\n" (substitute-command-keys "\ -and \\[universal-argument] \\[what-cursor-position] will give information about it.\n")))) - (insert "\nSelect \ -one of the following safe coding systems, or edit the buffer:\n") +where `\\[universal-argument] \\[what-cursor-position]' will give information about it.\n")))) + (insert (substitute-command-keys "\nSelect \ +one of the safe coding systems listed below,\n\ +or cancel the writing with \\[keyboard-quit] and edit the buffer\n\ + to remove or modify the problematic characters,\n\ +or specify any other coding system (and risk losing\n\ + the problematic characters).\n\n")) (let ((pos (point)) (fill-prefix " ")) (dolist (x codings) (princ " ") (princ x)) (insert "\n") - (fill-region-as-paragraph pos (point))) - (insert "Or specify any other coding system -at the risk of losing the problematic characters.\n"))) + (fill-region-as-paragraph pos (point))))) ;; Read a coding system. (setq coding-system @@ -859,7 +865,7 @@ and TO is ignored." (let ((no-other-defaults nil) auto-cs) - (unless (or (stringp from) find-file-literally) + (unless (or (stringp from) find-file-literally) ;; Find an auto-coding that is specified for the the current ;; buffer and file from the region FROM and TO. (save-excursion @@ -921,7 +927,7 @@ It is highly recommended to fix it before writing to a file." (rassq base default-coding-system) (setq default-coding-system (append default-coding-system - (list (cons default-buffer-file-coding-system + (list (cons default-buffer-file-coding-system base))))))) ;; If the most preferred coding system has the property mime-charset, @@ -948,10 +954,10 @@ It is highly recommended to fix it before writing to a file." (let ((default-eol-type (coding-system-eol-type (caar default-coding-system)))) (if (and (vectorp default-eol-type) buffer-file-coding-system) - (setq default-eol-type (coding-system-eol-type + (setq default-eol-type (coding-system-eol-type buffer-file-coding-system))) (if (and (vectorp default-eol-type) default-buffer-file-coding-system) - (setq default-eol-type (coding-system-eol-type + (setq default-eol-type (coding-system-eol-type default-buffer-file-coding-system))) (if (and default-eol-type (not (vectorp default-eol-type))) (dolist (elt default-coding-system) @@ -1235,7 +1241,7 @@ in the European submenu in each of those two menus." (dolist (elt alist) (set-language-info-internal lang-env (car elt) (cdr elt))) - + (if (equal lang-env current-language-environment) (set-language-environment lang-env)))) @@ -1358,10 +1364,8 @@ See the function `register-input-method' for the meanings of the elements.") (defun register-input-method (input-method lang-env &rest args) "Register INPUT-METHOD as an input method for language environment LANG-ENV. -INPUT-METHOD and LANG-ENV are symbols or strings. -The remaining arguments are: - ACTIVATE-FUNC, TITLE, DESCRIPTION, and ARGS... +INPUT-METHOD and LANG-ENV are symbols or strings. ACTIVATE-FUNC is a function to call to activate this method. TITLE is a string to show in the mode line when this method is active. DESCRIPTION is a string describing this method and what it is good for. @@ -1379,7 +1383,8 @@ string specified in this function takes precedence.) The commands `describe-input-method' and `list-input-methods' need these duplicated values to show some information about input methods -without loading the relevant Quail packages." +without loading the relevant Quail packages. +\n(fn INPUT-METHOD LANG-ENV ACTIVATE-FUNC TITLE DESCRIPTION &rest ARGS)" (if (symbolp lang-env) (setq lang-env (symbol-name lang-env))) (if (symbolp input-method) @@ -2609,6 +2614,9 @@ See also `locale-charset-language-names', `locale-language-names', (not (coding-system-equal coding-system locale-coding-system))) (prefer-coding-system coding-system) + ;; Fixme: perhaps prefer-coding-system should set this too. + ;; But it's not the time to do such a fundamental change. + (setq default-sendmail-coding-system coding-system) (setq locale-coding-system coding-system)))) ;; On Windows, override locale-coding-system, diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 1835fd573eb..2f88b08254f 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -1,8 +1,8 @@ ;;; mule-conf.el --- configure multilingual environment -*- no-byte-compile: t -*- -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005 -;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index 57b77249ba8..95569a78240 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -1,8 +1,9 @@ ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule) -;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index 8a57b61c6ac..d8b7aa903be 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -1,8 +1,9 @@ ;;; mule-util.el --- utility functions for mulitilingual environment (mule) -;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2004 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 8b610a04704..f9de9ecdf91 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -2,7 +2,8 @@ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el index 7c522698ead..e629a4554e1 100644 --- a/lisp/international/ogonek.el +++ b/lisp/international/ogonek.el @@ -1,6 +1,7 @@ ;;; ogonek.el --- change the encoding of Polish diacritics -;; Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: W{\l}odek Bzyl, Ryszard Kubiak ;; Maintainer: rysiek@ipipan.gda.pl (Ryszard Kubiak) diff --git a/lisp/international/quail.el b/lisp/international/quail.el index fceebf64f22..a3871224127 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -1,7 +1,9 @@ ;;; quail.el --- provides simple input method for multilingual text -;; Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/subst-big5.el b/lisp/international/subst-big5.el index 948f4011e8b..e9123bbc653 100644 --- a/lisp/international/subst-big5.el +++ b/lisp/international/subst-big5.el @@ -1,6 +1,6 @@ ;;; subst-big5.el --- Unicode/GB2312 translation -*-coding: big5;-*- -;; Copyright (C) 2002, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/international/subst-gb2312.el b/lisp/international/subst-gb2312.el index 380aff9cea2..6ee5cc3b458 100644 --- a/lisp/international/subst-gb2312.el +++ b/lisp/international/subst-gb2312.el @@ -1,6 +1,6 @@ ;;; subst-gb2312.el --- Unicode/GB2312 translation -*-coding: euc-china;-*- -;; Copyright (C) 2002, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/international/subst-jis.el b/lisp/international/subst-jis.el index ad6bd45cddf..1462c567b9c 100644 --- a/lisp/international/subst-jis.el +++ b/lisp/international/subst-jis.el @@ -1,6 +1,7 @@ ;;; subst-jis.el --- Unicode/JISX translation -*-coding: euc-jp;-*- -;; Copyright (C) 2002, 2004 Free Software Foundation, Inc. -;; Copyright (C) 2004 + +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/subst-ksc.el b/lisp/international/subst-ksc.el index a969d259a0b..a804be24bf5 100644 --- a/lisp/international/subst-ksc.el +++ b/lisp/international/subst-ksc.el @@ -1,5 +1,6 @@ ;;; subst-ksc.el --- Unicode/KSC-5601 translation -*-coding: euc-kr;-*- -;; Copyright (C) 2002, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 2a7bf4626ad..68e4f6596f7 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -1,7 +1,9 @@ ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/ucs-tables.el b/lisp/international/ucs-tables.el index a8ca220466a..0f413cd9fd3 100644 --- a/lisp/international/ucs-tables.el +++ b/lisp/international/ucs-tables.el @@ -1,7 +1,7 @@ ;;; ucs-tables.el --- translation to, from and via Unicode -*- coding: iso-2022-7bit -*- -;; Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -;; Copyright (C) 2002, 2003 +;; Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/utf-16.el b/lisp/international/utf-16.el index bbe2ab37bd8..712566bd736 100644 --- a/lisp/international/utf-16.el +++ b/lisp/international/utf-16.el @@ -1,7 +1,8 @@ ;;; utf-16.el --- UTF-16 encoding/decoding -;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -;; Copyright (C) 2002, 2003, 2004 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el index 68d77123cde..662b5306a75 100644 --- a/lisp/international/utf-7.el +++ b/lisp/international/utf-7.el @@ -1,6 +1,6 @@ ;;; utf-7.el --- utf-7 coding system -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n, mail diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el index 7a57a3d099b..53c65fa5fc4 100644 --- a/lisp/international/utf-8.el +++ b/lisp/international/utf-8.el @@ -1,7 +1,8 @@ ;;; utf-8.el --- UTF-8 decoding/encoding support -*- coding: iso-2022-7bit -*- -;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -;; Copyright (C) 2001, 2002, 2003, 2004 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/isearchb.el b/lisp/isearchb.el index 56797bd0fb1..5fd59a2e5ee 100644 --- a/lisp/isearchb.el +++ b/lisp/isearchb.el @@ -3,6 +3,7 @@ ;; Copyright (C) 2004, 2005, 2006 John Wiegley ;; Author: John Wiegley <johnw@gnu.org> +;; Maintainer: FSF ;; Created: 16 Apr 2004 ;; Version: 1.5 ;; Keywords: lisp diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 82c0461a3f8..07f5d068b4e 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -1,6 +1,6 @@ ;;; jka-compr.el --- reading/writing/loading compressed files -;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003, +;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: jka@ece.cmu.edu (Jay K. Adams) diff --git a/lisp/kermit.el b/lisp/kermit.el index e1bec988ccd..2b5f030b3b7 100644 --- a/lisp/kermit.el +++ b/lisp/kermit.el @@ -1,6 +1,6 @@ ;;; kermit.el --- additions to shell mode for use with kermit -;; Copyright (C) 1988, 2002, 2003, 2004, 2005, +;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Norden <jeff@colgate.csnet> diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el index 72f09bee8e0..bafdce1c854 100644 --- a/lisp/language/china-util.el +++ b/lisp/language/china-util.el @@ -1,8 +1,9 @@ ;;; china-util.el --- utilities for Chinese -*- coding: iso-2022-7bit -*- -;; Copyright (C) 1995, 2001, 2003 +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 2003 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el index dec8200fa58..ee1709fcc18 100644 --- a/lisp/language/chinese.el +++ b/lisp/language/chinese.el @@ -1,7 +1,9 @@ ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el index b99462dc205..321414242f8 100644 --- a/lisp/language/cyril-util.el +++ b/lisp/language/cyril-util.el @@ -1,6 +1,7 @@ ;;; cyril-util.el --- utilities for Cyrillic scripts -;; Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Cyrillic diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index 74322a6da36..4e709cc5b63 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@ -1,7 +1,9 @@ ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2001, 2002, 2003 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/czech.el b/lisp/language/czech.el index ee9c3ea6229..4eee8fd54b3 100644 --- a/lisp/language/czech.el +++ b/lisp/language/czech.el @@ -1,6 +1,7 @@ ;;; czech.el --- support for Czech -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1998, 2001 Free Software Foundation. +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Pavel Jan,Am(Bk <Pavel@Janik.cz> diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el index 297b30b94b8..354d0c19a29 100644 --- a/lisp/language/devan-util.el +++ b/lisp/language/devan-util.el @@ -1,8 +1,8 @@ ;;; devan-util.el --- Support for composing Devanagari characters -;; Copyright (C) 1997, 1998, 2001, 2002, 2003 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el index aeb0ea3c92a..1b6d9100b5b 100644 --- a/lisp/language/devanagari.el +++ b/lisp/language/devanagari.el @@ -1,6 +1,7 @@ ;;; devanagari.el --- Support for Devanagari -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Devanagari diff --git a/lisp/language/english.el b/lisp/language/english.el index ac9d4997129..f3719fd9bbc 100644 --- a/lisp/language/english.el +++ b/lisp/language/english.el @@ -1,7 +1,8 @@ ;;; english.el --- support for English -*- no-byte-compile: t -*- -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1997 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 7b950dccd80..b22fad32854 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -1,8 +1,8 @@ ;;; ethio-util.el --- utilities for Ethiopic -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2002 +;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2001, 2004, 2005 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el index 7857289ac47..29679a8ca73 100644 --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el @@ -1,7 +1,9 @@ ;;; ethiopic.el --- support for Ethiopic -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1995, 2001 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/european.el b/lisp/language/european.el index 54d0f86aaf9..60401e56ab1 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@ -1,8 +1,9 @@ ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el index 2bb24ed9364..b2624b9555f 100644 --- a/lisp/language/georgian.el +++ b/lisp/language/georgian.el @@ -1,6 +1,7 @@ ;;; georgian.el --- language support for Georgian -*- no-byte-compile: t -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/language/greek.el b/lisp/language/greek.el index ab68d819510..9eb7b4f7352 100644 --- a/lisp/language/greek.el +++ b/lisp/language/greek.el @@ -1,6 +1,7 @@ ;;; greek.el --- support for Greek -*- no-byte-compile: t -*- -;; Copyright (C) 1995 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el index 55628a5b986..abd2f6612bf 100644 --- a/lisp/language/hebrew.el +++ b/lisp/language/hebrew.el @@ -1,7 +1,9 @@ ;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. -;; Copyright (C) 1995 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el index 141bef2f0ba..1a082ba04e9 100644 --- a/lisp/language/ind-util.el +++ b/lisp/language/ind-util.el @@ -1,6 +1,7 @@ ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Devanagari diff --git a/lisp/language/indian.el b/lisp/language/indian.el index 7ab1203ed90..5d58271463b 100644 --- a/lisp/language/indian.el +++ b/lisp/language/indian.el @@ -1,7 +1,8 @@ ;;; indian.el --- Indian languages support -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc. -;; Copyright (C) 2002, 2003 +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index 2c72f529edd..c37e0bafd0a 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el @@ -1,7 +1,9 @@ ;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1998, 2000, 2003 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el index dc9bd644ae3..12a09423a32 100644 --- a/lisp/language/japanese.el +++ b/lisp/language/japanese.el @@ -1,7 +1,9 @@ ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/kannada.el b/lisp/language/kannada.el index 01e90ea55b8..77d793839da 100644 --- a/lisp/language/kannada.el +++ b/lisp/language/kannada.el @@ -1,6 +1,6 @@ ;;; kannada.el --- Support for Kannada -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: CHOWKSEY, Kailash C. <klchxbec@m-net.arbornet.org> ;; Keywords: multilingual, Indian, Kannada diff --git a/lisp/language/knd-util.el b/lisp/language/knd-util.el index 48ca148f302..dbdab4ead36 100644 --- a/lisp/language/knd-util.el +++ b/lisp/language/knd-util.el @@ -1,6 +1,6 @@ ;;; knd-util.el --- Support for composing Kannada characters -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Maintainer: CHOWKSEY, Kailash C. <klchxbec@m-net.arbornet.org> ;; Keywords: multilingual, Kannada diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el index d509ac6c825..f4d8e179eb2 100644 --- a/lisp/language/korea-util.el +++ b/lisp/language/korea-util.el @@ -1,7 +1,8 @@ ;;; korea-util.el --- utilities for Korean -;; Copyright (C) 1997, 1999 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999 +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/korean.el b/lisp/language/korean.el index d4d0f7754a6..3e04c13b7d0 100644 --- a/lisp/language/korean.el +++ b/lisp/language/korean.el @@ -1,7 +1,9 @@ ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1998 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1998 +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index edafe1c5d72..60f15670525 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -1,7 +1,8 @@ ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/lao.el b/lisp/language/lao.el index ddd7e369a17..b55c731801d 100644 --- a/lisp/language/lao.el +++ b/lisp/language/lao.el @@ -1,7 +1,7 @@ ;;; lao.el --- support for Lao -*- coding: iso-2022-7bit; no-byte-compile: t -*- ;; Copyright (C) 2001 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2002 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/malayalam.el b/lisp/language/malayalam.el index 3979deeaecb..ea264a87e64 100644 --- a/lisp/language/malayalam.el +++ b/lisp/language/malayalam.el @@ -1,6 +1,6 @@ ;;; malayalam.el --- Support for Malayalam -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Malayalam diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el index 70136ad681e..d7bc6f1b18b 100644 --- a/lisp/language/misc-lang.el +++ b/lisp/language/misc-lang.el @@ -1,6 +1,7 @@ ;;; misc-lang.el --- support for miscellaneous languages (characters) -*- no-byte-compile: t -*- -;; Copyright (C) 1995, 1997 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/mlm-util.el b/lisp/language/mlm-util.el index e575cfc61f4..e20d64cd293 100644 --- a/lisp/language/mlm-util.el +++ b/lisp/language/mlm-util.el @@ -1,6 +1,6 @@ ;;; mlm-util.el --- support for composing malayalam characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Malayalam diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el index 75db484fba5..50f0f4e7e82 100644 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el @@ -1,6 +1,7 @@ ;;; romanian.el --- support for Romanian -*- coding: iso-latin-2; no-byte-compile: t -*- -;; Copyright (C) 1998 Free Software Foundation. +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation. ;; Author: Dan Nicolaescu <done@ece.arizona.edu> ;; Keywords: multilingual, Romanian diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el index fd4f65eed30..27982c3ee16 100644 --- a/lisp/language/slovak.el +++ b/lisp/language/slovak.el @@ -1,6 +1,7 @@ ;;; slovak.el --- support for Slovak -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1998, 2001 Free Software Foundation. +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation. ;; Authors: Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>, ;; Milan Zamazal <pdm@zamazal.org> diff --git a/lisp/language/tamil.el b/lisp/language/tamil.el index 77a6f0d3d99..c1456f2a556 100644 --- a/lisp/language/tamil.el +++ b/lisp/language/tamil.el @@ -1,6 +1,6 @@ ;;; tamil.el --- Support for Tamil -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <batta@beige.ocn.ne.jp> ;; Keywords: multilingual, Indian, Tamil diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el index 2fabc56616d..d91cc56116e 100644 --- a/lisp/language/thai-util.el +++ b/lisp/language/thai-util.el @@ -1,9 +1,11 @@ ;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 -;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Keywords: mule, multilingual, thai diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el index ee8db1f2708..b6144a1fb47 100644 --- a/lisp/language/thai-word.el +++ b/lisp/language/thai-word.el @@ -1,6 +1,6 @@ ;;; thai-word.el -- find Thai word boundaries -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/thai.el b/lisp/language/thai.el index af966403c17..65d5f7d1748 100644 --- a/lisp/language/thai.el +++ b/lisp/language/thai.el @@ -1,9 +1,11 @@ ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 -;; Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Keywords: multilingual, Thai diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el index 135ddac38fe..d2d1950dad9 100644 --- a/lisp/language/tibet-util.el +++ b/lisp/language/tibet-util.el @@ -1,7 +1,9 @@ ;;; tibet-util.el --- utilities for Tibetan -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el index 3784e79b63a..f4ebb391610 100644 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@ -1,7 +1,8 @@ ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1999, 2000 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/tml-util.el b/lisp/language/tml-util.el index 00cb317651a..0e6e95e59d1 100644 --- a/lisp/language/tml-util.el +++ b/lisp/language/tml-util.el @@ -1,6 +1,6 @@ ;;; tml-util.el --- support for composing tamil characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Tamil diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el index 14ef84d9e88..894c0484c48 100644 --- a/lisp/language/utf-8-lang.el +++ b/lisp/language/utf-8-lang.el @@ -1,6 +1,7 @@ ;;; utf-8-lang.el --- generic UTF-8 language environment -*- no-byte-compile: t -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el index 20cf226dc00..0c4890cb9e4 100644 --- a/lisp/language/viet-util.el +++ b/lisp/language/viet-util.el @@ -1,7 +1,9 @@ ;;; viet-util.el --- utilities for Vietnamese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1998 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997 +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el index 9849fd0c538..870dd474451 100644 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el @@ -1,7 +1,9 @@ ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1998, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000 +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index f7d8d4612c1..18248771da0 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -4,7 +4,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (17383 38807)) +;;;;;; "play/5x5.el" (17817 14124)) ;;; Generated autoloads from play/5x5.el (autoload (quote 5x5) "5x5" "\ @@ -63,14 +63,14 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "abbrev" "abbrev.el" (17496 38721)) +;;;### (autoloads nil "abbrev" "abbrev.el" (17817 13973)) ;;; Generated autoloads from abbrev.el (put 'abbrev-mode 'safe-local-variable 'booleanp) ;;;*** ;;;### (autoloads (list-one-abbrev-table) "abbrevlist" "abbrevlist.el" -;;;;;; (17405 10313)) +;;;;;; (17817 13973)) ;;; Generated autoloads from abbrevlist.el (autoload (quote list-one-abbrev-table) "abbrevlist" "\ @@ -153,7 +153,7 @@ Insert a descriptive header at the top of the file. ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (17778 50475)) +;;;;;; (17817 13969)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload (quote ada-find-file) "ada-xref" "\ @@ -168,7 +168,7 @@ Completion is available. ;;;;;; change-log-mode add-change-log-entry-other-window add-change-log-entry ;;;;;; find-change-log prompt-for-change-log-name add-log-mailing-address ;;;;;; add-log-full-name add-log-current-defun-function) "add-log" -;;;;;; "add-log.el" (17778 50472)) +;;;;;; "add-log.el" (17817 16160)) ;;; Generated autoloads from add-log.el (defvar add-log-current-defun-function nil "\ @@ -306,7 +306,7 @@ Fix any old-style date entries in the current log file to default format. ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice ;;;;;; ad-enable-advice ad-default-compilation-action ad-redefinition-action) -;;;;;; "advice" "emacs-lisp/advice.el" (17713 5989)) +;;;;;; "advice" "emacs-lisp/advice.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action (quote warn) "\ @@ -434,7 +434,7 @@ See Info node `(elisp)Advising Functions' for comprehensive documentation. ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (17390 26934)) +;;;;;; align) "align" "align.el" (17817 15485)) ;;; Generated autoloads from align.el (autoload (quote align) "align" "\ @@ -524,7 +524,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el" -;;;;;; (17778 50472)) +;;;;;; (17817 16945)) ;;; Generated autoloads from allout.el (put (quote allout-show-bodies) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil))))))) @@ -573,88 +573,107 @@ accommodating syntax-sensitive text like programming languages. (For an example, see the allout code itself, which is organized as an allout outline.) -In addition to outline navigation and exposure, allout includes: +In addition to typical outline navigation and exposure, allout includes: - - topic-oriented repositioning, promotion/demotion, cut, and paste - - integral outline exposure-layout + - topic-oriented authoring, including keystroke-based topic creation, + repositioning, promotion/demotion, cut, and paste - incremental search with dynamic exposure and reconcealment of hidden text - - automatic topic-number maintenance + - adjustable format, so programming code can be developed in outline-structure - easy topic encryption and decryption - - \"Hot-spot\" operation, for single-keystroke maneuvering and - exposure control. (See the allout-mode docstring.) + - \"Hot-spot\" operation, for single-keystroke maneuvering and exposure control + - integral outline layout, for automatic initial exposure when visiting a file + - independent extensibility, using comprehensive exposure and authoring hooks and many other features. -Below is a description of the bindings, and then explanation of +Below is a description of the key bindings, and then explanation of special `allout-mode' features and terminology. See also the outline menubar additions for quick reference to many of the features, and see the docstring of the function `allout-init' for instructions on priming your emacs session for automatic activation of `allout-mode'. - -The bindings are dictated by the `allout-keybindings-list' and -`allout-command-prefix' variables. - - Navigation: Exposure Control: - ---------- ---------------- -\\[allout-next-visible-heading] allout-next-visible-heading | \\[allout-hide-current-subtree] allout-hide-current-subtree -\\[allout-previous-visible-heading] allout-previous-visible-heading | \\[allout-show-children] allout-show-children -\\[allout-up-current-level] allout-up-current-level | \\[allout-show-current-subtree] allout-show-current-subtree -\\[allout-forward-current-level] allout-forward-current-level | \\[allout-show-current-entry] allout-show-current-entry -\\[allout-backward-current-level] allout-backward-current-level | \\[allout-show-all] allout-show-all -\\[allout-end-of-entry] allout-end-of-entry -\\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot - - Topic Header Production: - ----------------------- -\\[allout-open-sibtopic] allout-open-sibtopic Create a new sibling after current topic. -\\[allout-open-subtopic] allout-open-subtopic ... an offspring of current topic. -\\[allout-open-supertopic] allout-open-supertopic ... a sibling of the current topic's parent. - - Topic Level and Prefix Adjustment: - --------------------------------- -\\[allout-shift-in] allout-shift-in Shift current topic and all offspring deeper. -\\[allout-shift-out] allout-shift-out ... less deep. -\\[allout-rebullet-current-heading] allout-rebullet-current-heading Prompt for alternate bullet for - current topic. -\\[allout-rebullet-topic] allout-rebullet-topic Reconcile bullets of topic and its offspring - - distinctive bullets are not changed, others - alternated according to nesting depth. -\\[allout-number-siblings] allout-number-siblings Number bullets of topic and siblings - the - offspring are not affected. With repeat - count, revoke numbering. - - Topic-oriented Killing and Yanking: - ---------------------------------- -\\[allout-kill-topic] allout-kill-topic Kill current topic, including offspring. -\\[allout-copy-topic-as-kill] allout-copy-topic-as-kill Copy current topic, including offspring. -\\[allout-kill-line] allout-kill-line kill-line, attending to outline structure. -\\[allout-copy-line-as-kill] allout-copy-line-as-kill Copy line but don't delete it. -\\[allout-yank] allout-yank Yank, adjusting depth of yanked topic to - depth of heading if yanking into bare topic - heading (ie, prefix sans text). -\\[allout-yank-pop] allout-yank-pop Is to allout-yank as yank-pop is to yank - - Topic-oriented Encryption: - ------------------------- -\\[allout-toggle-current-subtree-encryption] allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content - - Misc commands: - ------------- -M-x outlineify-sticky Activate outline mode for current buffer, - and establish a default file-var setting - for `allout-layout'. -\\[allout-mark-topic] allout-mark-topic -\\[allout-copy-exposed-to-buffer] allout-copy-exposed-to-buffer - Duplicate outline, sans concealed text, to - buffer with name derived from derived from that - of current buffer - \"*BUFFERNAME exposed*\". -\\[allout-flatten-exposed-to-buffer] allout-flatten-exposed-to-buffer - Like above 'copy-exposed', but convert topic - prefixes to section.subsection... numeric - format. -\\[eval-expression] (allout-init t) Setup Emacs session for outline mode - auto-activation. +The bindings are dictated by the customizable `allout-keybindings-list' +variable. We recommend customizing `allout-command-prefix' to use just +`\\C-c' as the command prefix, if the allout bindings don't conflict with +any personal bindings you have on \\C-c. In any case, outline structure +navigation and authoring is simplified by positioning the cursor on an +item's bullet character, the \"hot-spot\" - then you can invoke allout +commands with just the un-prefixed, un-control-shifted command letters. +This is described further in the HOT-SPOT Operation section. + + Exposure Control: + ---------------- +\\[allout-hide-current-subtree] `allout-hide-current-subtree' +\\[allout-show-children] `allout-show-children' +\\[allout-show-current-subtree] `allout-show-current-subtree' +\\[allout-show-current-entry] `allout-show-current-entry' +\\[allout-show-all] `allout-show-all' + + Navigation: + ---------- +\\[allout-next-visible-heading] `allout-next-visible-heading' +\\[allout-previous-visible-heading] `allout-previous-visible-heading' +\\[allout-up-current-level] `allout-up-current-level' +\\[allout-forward-current-level] `allout-forward-current-level' +\\[allout-backward-current-level] `allout-backward-current-level' +\\[allout-end-of-entry] `allout-end-of-entry' +\\[allout-beginning-of-current-entry] `allout-beginning-of-current-entry' (alternately, goes to hot-spot) +\\[allout-beginning-of-line] `allout-beginning-of-line' - like regular beginning-of-line, but + if immediately repeated cycles to the beginning of the current item + and then to the hot-spot (if `allout-beginning-of-line-cycles' is set). + + + Topic Header Production: + ----------------------- +\\[allout-open-sibtopic] `allout-open-sibtopic' Create a new sibling after current topic. +\\[allout-open-subtopic] `allout-open-subtopic' ... an offspring of current topic. +\\[allout-open-supertopic] `allout-open-supertopic' ... a sibling of the current topic's parent. + + Topic Level and Prefix Adjustment: + --------------------------------- +\\[allout-shift-in] `allout-shift-in' Shift current topic and all offspring deeper +\\[allout-shift-out] `allout-shift-out' ... less deep +\\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for + current topic +\\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and + its' offspring - distinctive bullets are not changed, others + are alternated according to nesting depth. +\\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings - + the offspring are not affected. + With repeat count, revoke numbering. + + Topic-oriented Killing and Yanking: + ---------------------------------- +\\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring. +\\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring. +\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure. +\\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it. +\\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to + depth of heading if yanking into bare topic + heading (ie, prefix sans text). +\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank + + Topic-oriented Encryption: + ------------------------- +\\[allout-toggle-current-subtree-encryption] `allout-toggle-current-subtree-encryption' + Encrypt/Decrypt topic content + + Misc commands: + ------------- +M-x outlineify-sticky Activate outline mode for current buffer, + and establish a default file-var setting + for `allout-layout'. +\\[allout-mark-topic] `allout-mark-topic' +\\[allout-copy-exposed-to-buffer] `allout-copy-exposed-to-buffer' + Duplicate outline, sans concealed text, to + buffer with name derived from derived from that + of current buffer - \"*BUFFERNAME exposed*\". +\\[allout-flatten-exposed-to-buffer] `allout-flatten-exposed-to-buffer' + Like above 'copy-exposed', but convert topic + prefixes to section.subsection... numeric + format. +\\[eval-expression] (allout-init t) Setup Emacs session for outline mode + auto-activation. Topic Encryption @@ -662,17 +681,22 @@ Outline mode supports gpg encryption of topics, with support for symmetric and key-pair modes, passphrase timeout, passphrase consistency checking, user-provided hinting for symmetric key mode, and auto-encryption of topics pending encryption on save. -\(Topics pending encryption are, by default, automatically -encrypted during file saves; if you're editing the contents of -such a topic, it is automatically decrypted for continued -editing.) The aim is reliable topic privacy while preventing -accidents like neglected encryption before saves, forgetting -which passphrase was used, and other practical pitfalls. -See `allout-toggle-current-subtree-encryption' function docstring and -`allout-encrypt-unencrypted-on-saves' customization variable for details. +Topics pending encryption are, by default, automatically +encrypted during file saves. If the contents of the topic +containing the cursor was encrypted for a save, it is +automatically decrypted for continued editing. + +The aim of these measures is reliable topic privacy while +preventing accidents like neglected encryption before saves, +forgetting which passphrase was used, and other practical +pitfalls. - HOT-SPOT Operation +See `allout-toggle-current-subtree-encryption' function docstring +and `allout-encrypt-unencrypted-on-saves' customization variable +for details. + + HOT-SPOT Operation Hot-spot operation provides a means for easy, single-keystroke outline navigation and exposure control. @@ -685,85 +709,108 @@ would invoke the command typically bound to \"C-c<space>C-f\" Thus, by positioning the cursor on a topic bullet, you can execute the outline navigation and manipulation commands with a -single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get +single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) don't get this special translation, so you can use them to get out of the -hot-spot and back to normal operation. +hot-spot and back to normal editing operation. + +In allout-mode, the normal beginning-of-line command (\\[allout-beginning-of-line]]) is +replaced with one that makes it easy to get to the hot-spot. If you +repeat it immediately it cycles (if `allout-beginning-of-line-cycles' +is set) to the beginning of the item and then, if you hit it again +immediately, to the hot-spot. Similarly, `allout-beginning-of-current-entry' +\(\\[allout-beginning-of-current-entry]) moves to the hot-spot when the cursor is already located +at the beginning of the current entry. + + Extending Allout -Note that the command `allout-beginning-of-current-entry' (\\[allout-beginning-of-current-entry]) -will move to the hot-spot when the cursor is already located at the -beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry] -twice in a row to get to the hot-spot. +Allout exposure and authoring activites all have associated +hooks, by which independent code can cooperate with allout +without changes to the allout core. Here are key ones: - Terminology +`allout-mode-hook' +`allout-mode-deactivate-hook' +`allout-exposure-change-hook' +`allout-structure-added-hook' +`allout-structure-deleted-hook' +`allout-structure-shifted-hook' + + Terminology Topic hierarchy constituents - TOPICS and SUBTOPICS: -TOPIC: A basic, coherent component of an Emacs outline. It can - contain and be contained by other topics. -CURRENT topic: - The visible topic most immediately containing the cursor. -DEPTH: The degree of nesting of a topic; it increases with - containment. Also called the: -LEVEL: The same as DEPTH. +ITEM: A unitary outline element, including the HEADER and ENTRY text. +TOPIC: An ITEM and any ITEMs contained within it, ie having greater DEPTH + and with no intervening items of lower DEPTH than the container. +CURRENT ITEM: + The visible ITEM most immediately containing the cursor. +DEPTH: The degree of nesting of an ITEM; it increases with containment. + The DEPTH is determined by the HEADER PREFIX. The DEPTH is also + called the: +LEVEL: The same as DEPTH. ANCESTORS: - The topics that contain a topic. -PARENT: A topic's immediate ancestor. It has a depth one less than - the topic. + Those ITEMs whose TOPICs contain an ITEM. +PARENT: An ITEM's immediate ANCESTOR. It has a DEPTH one less than that + of the ITEM. OFFSPRING: - The topics contained by a topic; + The ITEMs contained within an ITEM's TOPIC. SUBTOPIC: - An immediate offspring of a topic; -CHILDREN: - The immediate offspring of a topic. + An OFFSPRING of its ANCESTOR TOPICs. +CHILD: + An immediate SUBTOPIC of its PARENT. SIBLINGS: - Topics having the same parent and depth. + TOPICs having the same PARENT and DEPTH. Topic text constituents: -HEADER: The first line of a topic, include the topic PREFIX and header - text. -PREFIX: The leading text of a topic which distinguishes it from normal - text. It has a strict form, which consists of a prefix-lead - string, padding, and a bullet. The bullet may be followed by a +HEADER: The first line of an ITEM, include the ITEM PREFIX and HEADER + text. +ENTRY: The text content of an ITEM, before any OFFSPRING, but including + the HEADER text and distinct from the ITEM PREFIX. +BODY: Same as ENTRY. +PREFIX: The leading text of an ITEM which distinguishes it from normal + ENTRY text. Allout recognizes the outline structure according + to the strict PREFIX format. It consists of a PREFIX-LEAD string, + PREFIX-PADDING, and a BULLET. The BULLET might be followed by a number, indicating the ordinal number of the topic among its - siblings, a space, and then the header text. + siblings, or an asterisk indicating encryption, plus an optional + space. After that is the ITEM HEADER text, which is not part of + the PREFIX. - The relative length of the PREFIX determines the nesting depth - of the topic. + The relative length of the PREFIX determines the nesting DEPTH + of the ITEM. PREFIX-LEAD: - The string at the beginning of a topic prefix, normally a `.'. - It can be customized by changing the setting of - `allout-header-prefix' and then reinitializing `allout-mode'. - - By setting the prefix-lead to the comment-string of a - programming language, you can embed outline structuring in - program code without interfering with the language processing - of that code. See `allout-use-mode-specific-leader' - docstring for more detail. + The string at the beginning of a HEADER PREFIX, by default a `.'. + It can be customized by changing the setting of + `allout-header-prefix' and then reinitializing `allout-mode'. + + When the PREFIX-LEAD is set to the comment-string of a + programming language, outline structuring can be embedded in + program code without interfering with processing of the text + (by emacs or the language processor) as program code. This + setting happens automatically when allout mode is used in + programming-mode buffers. See `allout-use-mode-specific-leader' + docstring for more detail. PREFIX-PADDING: - Spaces or asterisks which separate the prefix-lead and the - bullet, determining the depth of the topic. -BULLET: A character at the end of the topic prefix, it must be one of - the characters listed on `allout-plain-bullets-string' or + Spaces or asterisks which separate the PREFIX-LEAD and the + bullet, determining the ITEM's DEPTH. +BULLET: A character at the end of the ITEM PREFIX, it must be one of + the characters listed on `allout-plain-bullets-string' or `allout-distinctive-bullets-string'. (See the documentation for these variables for more details.) The default choice of - bullet when generating topics varies in a cycle with the depth of - the topic. -ENTRY: The text contained in a topic before any offspring. -BODY: Same as ENTRY. - + BULLET when generating ITEMs varies in a cycle with the DEPTH of + the ITEM. EXPOSURE: - The state of a topic which determines the on-screen visibility - of its offspring and contained text. + The state of a TOPIC which determines the on-screen visibility + of its OFFSPRING and contained ENTRY text. CONCEALED: - Topics and entry text whose display is inhibited. Contiguous - units of concealed text is represented by `...' ellipses. + TOPICs and ENTRY text whose EXPOSURE is inhibited. Concealed + text is represented by \"...\" ellipses. - Concealed topics are effectively collapsed within an ancestor. -CLOSED: A topic whose immediate offspring and body-text is concealed. -OPEN: A topic that is not closed, though its offspring or body may be. + CONCEALED TOPICs are effectively collapsed within an ANCESTOR. +CLOSED: A TOPIC whose immediate OFFSPRING and body-text is CONCEALED. +OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be. \(fn &optional TOGGLE)" t nil) @@ -780,7 +827,7 @@ setup for auto-startup. ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (17390 26944)) +;;;;;; "net/ange-ftp.el" (17817 15940)) ;;; Generated autoloads from net/ange-ftp.el (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir)) @@ -1079,8 +1126,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17611 -;;;;;; 9183)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17817 +;;;;;; 13973)) ;;; Generated autoloads from arc-mode.el (autoload (quote archive-mode) "arc-mode" "\ @@ -1100,7 +1147,7 @@ archive. ;;;*** -;;;### (autoloads (array-mode) "array" "array.el" (17374 21266)) +;;;### (autoloads (array-mode) "array" "array.el" (17817 13973)) ;;; Generated autoloads from array.el (autoload (quote array-mode) "array" "\ @@ -1422,7 +1469,7 @@ This command is obsolete. ;;;*** ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el" -;;;;;; (17778 50472)) +;;;;;; (17817 13973)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1476,7 +1523,7 @@ etc. to supply digit arguments. ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (17390 27404)) +;;;;;; (17817 14147)) ;;; Generated autoloads from progmodes/autoconf.el (autoload (quote autoconf-mode) "autoconf" "\ @@ -1487,7 +1534,7 @@ Major mode for editing Autoconf configure.in files. ;;;*** ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert) -;;;;;; "autoinsert" "autoinsert.el" (17713 5989)) +;;;;;; "autoinsert" "autoinsert.el" (17817 13973)) ;;; Generated autoloads from autoinsert.el (autoload (quote auto-insert) "autoinsert" "\ @@ -1629,7 +1676,7 @@ Use `auto-revert-mode' to revert a particular buffer. ;;;*** ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid" -;;;;;; "avoid.el" (17713 5162)) +;;;;;; "avoid.el" (17817 13974)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1759,8 +1806,8 @@ non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17778 -;;;;;; 50479)) +;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17817 +;;;;;; 14127)) ;;; Generated autoloads from textmodes/bibtex.el (autoload (quote bibtex-mode) "bibtex" "\ @@ -2158,7 +2205,7 @@ deletion, or > if it is flagged for displaying. ;;;;;; browse-url browse-url-of-region browse-url-of-dired-file ;;;;;; browse-url-of-buffer browse-url-of-file browse-url-url-at-point ;;;;;; browse-url-galeon-program browse-url-firefox-program browse-url-browser-function) -;;;;;; "browse-url" "net/browse-url.el" (17524 8597)) +;;;;;; "browse-url" "net/browse-url.el" (17817 13984)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function (cond ((memq system-type (quote (windows-nt ms-dos cygwin))) (quote browse-url-default-windows-browser)) ((memq system-type (quote (darwin))) (quote browse-url-default-macosx-browser)) (t (quote browse-url-default-browser))) "\ @@ -2172,17 +2219,17 @@ associated with the first REGEXP which matches the current URL. The function is passed the URL and any other args of `browse-url'. The last regexp should probably be \".\" to specify a default browser.") -(custom-autoload (quote browse-url-browser-function) "browse-url") +(custom-autoload (quote browse-url-browser-function) "browse-url" t) (defvar browse-url-firefox-program "firefox" "\ *The name by which to invoke Firefox.") -(custom-autoload (quote browse-url-firefox-program) "browse-url") +(custom-autoload (quote browse-url-firefox-program) "browse-url" t) (defvar browse-url-galeon-program "galeon" "\ *The name by which to invoke Galeon.") -(custom-autoload (quote browse-url-galeon-program) "browse-url") +(custom-autoload (quote browse-url-galeon-program) "browse-url" t) (autoload (quote browse-url-url-at-point) "browse-url" "\ Not documented @@ -2489,8 +2536,8 @@ Default to the URL around or before point. ;;;*** -;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17383 -;;;;;; 38807)) +;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17817 +;;;;;; 14124)) ;;; Generated autoloads from play/bruce.el (autoload (quote bruce) "bruce" "\ @@ -2506,7 +2553,7 @@ Return a vector containing the lines from `bruce-phrases-file'. ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (17778 50472)) +;;;;;; "bs" "bs.el" (17817 16161)) ;;; Generated autoloads from bs.el (autoload (quote bs-cycle-next) "bs" "\ @@ -2740,7 +2787,7 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17778 50472)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17817 16161)) ;;; Generated autoloads from calendar/cal-dst.el (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t) @@ -2872,7 +2919,7 @@ See the documentation for `calculator-mode' for more information. ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar ;;;;;; view-diary-entries-initially calendar-offset) "calendar" -;;;;;; "calendar/calendar.el" (17778 50296)) +;;;;;; "calendar/calendar.el" (17817 16151)) ;;; Generated autoloads from calendar/calendar.el (defvar calendar-offset 0 "\ @@ -3462,15 +3509,15 @@ it fails. ;;;*** -;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (17515 -;;;;;; 24859)) +;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (17817 +;;;;;; 13957)) ;;; Generated autoloads from progmodes/cc-compat.el (put 'c-indent-level 'safe-local-variable 'integerp) ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (17411 11765)) +;;;;;; (17817 13957)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload (quote c-guess-basic-syntax) "cc-engine" "\ @@ -3482,7 +3529,7 @@ Return the syntactic context of the current line. ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (17611 8970)) +;;;;;; (17817 15855)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@ -3640,7 +3687,7 @@ Key bindings: ;;;*** ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles" -;;;;;; "progmodes/cc-styles.el" (17524 8597)) +;;;;;; "progmodes/cc-styles.el" (17817 13957)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload (quote c-set-style) "cc-styles" "\ @@ -3698,7 +3745,7 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17778 50475)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17817 13957)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3708,7 +3755,7 @@ and exists only for compatibility reasons. ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program ;;;;;; declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el" -;;;;;; (17279 27079)) +;;;;;; (17817 15477)) ;;; Generated autoloads from international/ccl.el (autoload (quote ccl-compile) "ccl" "\ @@ -4172,8 +4219,8 @@ checking of documentation strings. ;;;*** ;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer -;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17279 -;;;;;; 27080)) +;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17817 +;;;;;; 15478)) ;;; Generated autoloads from language/china-util.el (autoload (quote decode-hz-region) "china-util" "\ @@ -4201,7 +4248,7 @@ Encode the text in the current buffer to HZ. ;;;*** ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command) -;;;;;; "chistory" "chistory.el" (17390 26936)) +;;;;;; "chistory" "chistory.el" (17817 13974)) ;;; Generated autoloads from chistory.el (autoload (quote repeat-matching-complex-command) "chistory" "\ @@ -4240,7 +4287,7 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17713 5989)) +;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/cl.el (defvar custom-print-functions nil "\ @@ -4287,8 +4334,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17390 -;;;;;; 26936)) +;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17817 +;;;;;; 14115)) ;;; Generated autoloads from cmuscheme.el (autoload (quote run-scheme) "cmuscheme" "\ @@ -4296,7 +4343,8 @@ Run an inferior Scheme process, input and output via buffer `*scheme*'. If there is a process already running in `*scheme*', switch to that buffer. With argument, allows you to edit the command line (default is value of `scheme-program-name'). -If a file `~/.emacs_SCHEMENAME' exists, it is given as initial input. +If the file `~/.emacs_SCHEMENAME' or `~/.emacs.d/init_SCHEMENAME.scm' exists, +it is given as initial input. Note that this may lose due to a timing error if the Scheme processor discards input when it starts up. Runs the hook `inferior-scheme-mode-hook' (after the `comint-mode-hook' @@ -4309,7 +4357,7 @@ is run). ;;;*** ;;;### (autoloads (cp-make-coding-system) "code-pages" "international/code-pages.el" -;;;;;; (17713 5990)) +;;;;;; (17817 14139)) ;;; Generated autoloads from international/code-pages.el (autoload (quote cp-make-coding-system) "code-pages" "\ @@ -4370,7 +4418,7 @@ Return an updated `non-iso-charset-alist'. ;;;### (autoloads (codepage-setup cp-supported-codepages cp-offset-for-codepage ;;;;;; cp-language-for-codepage cp-charset-for-codepage cp-make-coding-systems-for-codepage) -;;;;;; "codepage" "international/codepage.el" (17713 5990)) +;;;;;; "codepage" "international/codepage.el" (17817 15477)) ;;; Generated autoloads from international/codepage.el (autoload (quote cp-make-coding-systems-for-codepage) "codepage" "\ @@ -4429,7 +4477,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal. ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (17778 50473)) +;;;;;; (17817 15855)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\ @@ -4519,8 +4567,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17713 -;;;;;; 5305)) +;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17817 +;;;;;; 13974)) ;;; Generated autoloads from compare-w.el (autoload (quote compare-windows) "compare-w" "\ @@ -4719,7 +4767,7 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** ;;;### (autoloads (partial-completion-mode) "complete" "complete.el" -;;;;;; (17713 4883)) +;;;;;; (17817 13974)) ;;; Generated autoloads from complete.el (defvar partial-completion-mode nil "\ @@ -4761,7 +4809,7 @@ second TAB brings up the `*Completions*' buffer. ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (17713 5989)) +;;;;;; (17817 13975)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4783,7 +4831,7 @@ Enable dynamic word-completion. ;;;### (autoloads (decompose-composite-char compose-last-chars compose-chars-after ;;;;;; find-composition compose-chars decompose-string compose-string ;;;;;; decompose-region compose-region encode-composition-rule) -;;;;;; "composite" "composite.el" (17327 23539)) +;;;;;; "composite" "composite.el" (17817 15477)) ;;; Generated autoloads from composite.el (defconst reference-point-alist (quote ((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5))) "\ @@ -5161,7 +5209,7 @@ For details see `conf-mode'. Example: ;;;*** ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie) -;;;;;; "cookie1" "play/cookie1.el" (17569 17996)) +;;;;;; "cookie1" "play/cookie1.el" (17817 14124)) ;;; Generated autoloads from play/cookie1.el (autoload (quote cookie) "cookie1" "\ @@ -5221,7 +5269,7 @@ Insert a copyright by $ORGANIZATION notice at cursor. ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (17778 50475)) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (17817 13977)) ;;; Generated autoloads from progmodes/cperl-mode.el (autoload (quote cperl-mode) "cperl-mode" "\ @@ -5431,7 +5479,7 @@ Edit display information for cpp conditionals. ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (17390 26938)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -5442,7 +5490,7 @@ indicates CRiSP mode is enabled. Setting this variable directly does not take effect; use either M-x customize or the function `crisp-mode'.") -(custom-autoload (quote crisp-mode) "crisp") +(custom-autoload (quote crisp-mode) "crisp" nil) (autoload (quote crisp-mode) "crisp" "\ Toggle CRiSP/Brief emulation minor mode. @@ -5455,7 +5503,7 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise. ;;;*** ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el" -;;;;;; (17515 24857)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload (quote completing-read-multiple) "crm" "\ @@ -5491,7 +5539,7 @@ INHERIT-INPUT-METHOD. ;;;*** ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" -;;;;;; (17713 6163)) +;;;;;; (17817 13978)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5557,8 +5605,25 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;;;; customize-face customize-changed-options customize-option-other-window ;;;;;; customize-option customize-group-other-window customize-group ;;;;;; customize-mode customize customize-save-variable customize-set-variable -;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17778 50473)) +;;;;;; customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically +;;;;;; custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el" +;;;;;; (17817 16161)) ;;; Generated autoloads from cus-edit.el + +(defvar custom-browse-sort-alphabetically nil "\ +If non-nil, sort customization group alphabetically in `custom-browse'.") + +(custom-autoload (quote custom-browse-sort-alphabetically) "cus-edit" t) + +(defvar custom-buffer-sort-alphabetically nil "\ +If non-nil, sort each customization group alphabetically in Custom buffer.") + +(custom-autoload (quote custom-buffer-sort-alphabetically) "cus-edit" t) + +(defvar custom-menu-sort-alphabetically nil "\ +If non-nil, sort each customization group alphabetically in menus.") + +(custom-autoload (quote custom-menu-sort-alphabetically) "cus-edit" t) (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'") (autoload (quote customize-set-value) "cus-edit" "\ @@ -5927,7 +5992,7 @@ Create a custom theme. ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el" -;;;;;; (17496 38723)) +;;;;;; (17817 13975)) ;;; Generated autoloads from cvs-status.el (autoload (quote cvs-status-mode) "cvs-status" "\ @@ -5982,7 +6047,7 @@ in which `turn-on-cwarn-mode-if-enabled' turns it on. ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char ;;;;;; cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el" -;;;;;; (17279 27080)) +;;;;;; (17817 14143)) ;;; Generated autoloads from language/cyril-util.el (autoload (quote cyrillic-encode-koi8-r-char) "cyril-util" "\ @@ -6227,7 +6292,7 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (17383 38807)) +;;;;;; (17817 14124)) ;;; Generated autoloads from play/decipher.el (autoload (quote decipher) "decipher" "\ @@ -6256,8 +6321,8 @@ The most useful commands are: ;;;*** ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region -;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17713 -;;;;;; 5989)) +;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17817 +;;;;;; 13975)) ;;; Generated autoloads from delim-col.el (autoload (quote delimit-columns-customize) "delim-col" "\ @@ -6363,7 +6428,7 @@ any selection. ;;;*** ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) -;;;;;; "derived" "emacs-lisp/derived.el" (17390 26938)) +;;;;;; "derived" "emacs-lisp/derived.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload (quote define-derived-mode) "derived" "\ @@ -6428,7 +6493,7 @@ the first time the mode is used. ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (17778 50473)) +;;;;;; "descr-text.el" (17817 13959)) ;;; Generated autoloads from descr-text.el (autoload (quote describe-text-properties) "descr-text" "\ @@ -6637,7 +6702,7 @@ Revert to the last loaded desktop. ;;;### (autoloads (gnus-article-outlook-deuglify-article gnus-outlook-deuglify-article ;;;;;; gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines) -;;;;;; "deuglify" "gnus/deuglify.el" (17490 7932)) +;;;;;; "deuglify" "gnus/deuglify.el" (17817 15855)) ;;; Generated autoloads from gnus/deuglify.el (autoload (quote gnus-article-outlook-unwrap-lines) "deuglify" "\ @@ -6670,7 +6735,7 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** ;;;### (autoloads (devanagari-post-read-conversion devanagari-compose-region) -;;;;;; "devan-util" "language/devan-util.el" (17279 27080)) +;;;;;; "devan-util" "language/devan-util.el" (17817 15478)) ;;; Generated autoloads from language/devan-util.el (defconst devanagari-consonant "[\x51ad5-\x51af9\x51b38-\x51b3f]") @@ -6798,7 +6863,7 @@ Minor mode for viewing/editing context diffs. ;;;;;; dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink ;;;;;; dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename ;;;;;; dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches) -;;;;;; "dired" "dired.el" (17778 50473)) +;;;;;; "dired" "dired.el" (17817 16882)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches "-al" "\ @@ -7429,7 +7494,7 @@ buffer and try again. ;;;*** -;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17591 9569)) +;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17817 13975)) ;;; Generated autoloads from dirtrack.el (autoload (quote dirtrack) "dirtrack" "\ @@ -7467,7 +7532,7 @@ redefine OBJECT if it is a symbol. ;;;;;; standard-display-graphic standard-display-g1 standard-display-ascii ;;;;;; standard-display-default standard-display-8bit describe-current-display-table ;;;;;; describe-display-table set-display-table-slot display-table-slot -;;;;;; make-display-table) "disp-table" "disp-table.el" (17778 50473)) +;;;;;; make-display-table) "disp-table" "disp-table.el" (17817 13975)) ;;; Generated autoloads from disp-table.el (autoload (quote make-display-table) "disp-table" "\ @@ -7568,7 +7633,7 @@ for users who call this function in `.emacs'. ;;;*** ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el" -;;;;;; (17383 38807)) +;;;;;; (17817 14124)) ;;; Generated autoloads from play/dissociate.el (autoload (quote dissociated-press) "dissociate" "\ @@ -7629,7 +7694,7 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17374 21430)) +;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17817 14124)) ;;; Generated autoloads from play/doctor.el (autoload (quote doctor) "doctor" "\ @@ -7640,7 +7705,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** ;;;### (autoloads (double-mode double-mode) "double" "double.el" -;;;;;; (17390 26937)) +;;;;;; (17817 13975)) ;;; Generated autoloads from double.el (defvar double-mode nil "\ @@ -7648,7 +7713,7 @@ Toggle Double mode. Setting this variable directly does not take effect; use either \\[customize] or the function `double-mode'.") -(custom-autoload (quote double-mode) "double") +(custom-autoload (quote double-mode) "double" nil) (autoload (quote double-mode) "double" "\ Toggle Double mode. @@ -7684,7 +7749,7 @@ Play sounds in message buffers. ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-global-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (17778 50473)) +;;;;;; "emacs-lisp/easy-mmode.el" (17817 16945)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode)) @@ -7732,7 +7797,7 @@ For example, you could write (defalias (quote easy-mmode-define-global-mode) (quote define-global-minor-mode)) (autoload (quote define-global-minor-mode) "easy-mmode" "\ -Make GLOBAL-MODE out of the buffer-local minor MODE. +Make a global mode GLOBAL-MODE corresponding to buffer-local minor MODE. TURN-ON is a function that will be called with no args in every buffer and that should try to turn MODE on if applicable for that buffer. KEYS is a list of CL-style keyword arguments. As the minor mode @@ -7776,8 +7841,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define -;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17390 -;;;;;; 26938)) +;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17817 +;;;;;; 16161)) ;;; Generated autoloads from emacs-lisp/easymenu.el (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun)) @@ -7904,6 +7969,10 @@ should contain a submenu named NAME. ITEMS is a list of menu items, as in `easy-menu-define'. These items entirely replace the previous items in that submenu. +If MAP is specified, it should normally be a keymap; nil stands for the local +menu-bar keymap. It can also be a symbol, which has earlier been used as the +first argument in a call to `easy-menu-define', or the value of such a symbol. + If the menu located by PATH has no submenu named NAME, add one. If the optional argument BEFORE is present, add it just before the submenu named BEFORE, otherwise add it at the end of the menu. @@ -7911,7 +7980,7 @@ the submenu named BEFORE, otherwise add it at the end of the menu. To implement dynamic menus, either call this from `menu-bar-update-hook' or use a menu filter. -\(fn PATH NAME ITEMS &optional BEFORE)" nil nil) +\(fn PATH NAME ITEMS &optional BEFORE MAP)" nil nil) ;;;*** @@ -7922,7 +7991,7 @@ To implement dynamic menus, either call this from ;;;;;; ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ebnf-spool-file ;;;;;; ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (17778 50475)) +;;;;;; "progmodes/ebnf2ps.el" (17817 13971)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload (quote ebnf-customize) "ebnf2ps" "\ @@ -8333,7 +8402,7 @@ Display statistics for a class tree. ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (17778 50473)) +;;;;;; (17817 13975)) ;;; Generated autoloads from ebuff-menu.el (autoload (quote electric-buffer-list) "ebuff-menu" "\ @@ -8358,7 +8427,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** ;;;### (autoloads (Electric-command-history-redo-expression) "echistory" -;;;;;; "echistory.el" (17390 26937)) +;;;;;; "echistory.el" (17817 13975)) ;;; Generated autoloads from echistory.el (autoload (quote Electric-command-history-redo-expression) "echistory" "\ @@ -8739,7 +8808,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (17713 2486)) +;;;;;; (17817 13975)) ;;; Generated autoloads from edmacro.el (defvar edmacro-eight-bits nil "\ @@ -8792,7 +8861,7 @@ or nil, use a compact 80-column format. ;;;*** ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt" -;;;;;; "emulation/edt.el" (17390 26938)) +;;;;;; "emulation/edt.el" (17817 15738)) ;;; Generated autoloads from emulation/edt.el (autoload (quote edt-set-scroll-margins) "edt" "\ @@ -8848,7 +8917,7 @@ Not documented ;;;*** ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) -;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17713 5989)) +;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string " ElDoc" "\ @@ -8886,8 +8955,8 @@ Emacs Lisp mode) that support Eldoc.") ;;;*** -;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17390 -;;;;;; 26937)) +;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17817 +;;;;;; 13975)) ;;; Generated autoloads from elide-head.el (autoload (quote elide-head) "elide-head" "\ @@ -8903,7 +8972,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el" -;;;;;; (17390 26938)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload (quote elint-initialize) "elint" "\ @@ -9042,7 +9111,7 @@ Not documented ;;;*** ;;;### (autoloads (encoded-kbd-setup-display) "encoded-kb" "international/encoded-kb.el" -;;;;;; (17323 25934)) +;;;;;; (17817 15477)) ;;; Generated autoloads from international/encoded-kb.el (autoload (quote encoded-kbd-setup-display) "encoded-kb" "\ @@ -9055,7 +9124,7 @@ DISPLAY may be a display id, a frame, or nil for the selected frame's display. ;;;*** ;;;### (autoloads (enriched-decode enriched-encode enriched-mode) -;;;;;; "enriched" "textmodes/enriched.el" (17778 50479)) +;;;;;; "enriched" "textmodes/enriched.el" (17817 14127)) ;;; Generated autoloads from textmodes/enriched.el (autoload (quote enriched-mode) "enriched" "\ @@ -9086,7 +9155,7 @@ Not documented ;;;*** ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc" -;;;;;; "erc/erc.el" (17778 50473)) +;;;;;; "erc/erc.el" (17817 15473)) ;;; Generated autoloads from erc/erc.el (autoload (quote erc-select-read-args) "erc" "\ @@ -9142,7 +9211,7 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (17778 50473)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (17817 13983)) ;;; Generated autoloads from erc/erc-dcc.el (autoload (quote erc-cmd-DCC) "erc-dcc" "\ @@ -9174,7 +9243,7 @@ that subcommand. ;;;;;; erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list ;;;;;; erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action ;;;;;; erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el" -;;;;;; (17469 12056)) +;;;;;; (17817 14136)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload (quote erc-cmd-ezb) "erc-ezbounce" "\ @@ -9205,7 +9274,7 @@ Identify to the EZBouncer server. \(fn MESSAGE)" nil nil) (autoload (quote erc-ezb-init-session-list) "erc-ezbounce" "\ -Reset the EZBounce session list to NIL. +Reset the EZBounce session list to nil. \(fn MESSAGE)" nil nil) @@ -9295,27 +9364,6 @@ Not documented ;;;*** -;;;### (autoloads (erc-chanlist erc-list-channels) "erc-list" "erc/erc-list.el" -;;;;;; (17396 42158)) -;;; Generated autoloads from erc/erc-list.el - (autoload 'erc-list-mode "erc-list") - -(autoload (quote erc-list-channels) "erc-list" "\ -Display a buffer containing a list of channels on the current server. -Optional argument CHANNEL specifies a single channel to list (instead of every -available channel). - -\(fn &rest CHANNEL)" t nil) - -(autoload (quote erc-chanlist) "erc-list" "\ -Show a channel listing of the current server in a special mode. -Please note that this function only works with IRC servers which conform -to RFC and send the LIST header (#321) at start of list transmission. - -\(fn &optional CHANNELS)" t nil) - -;;;*** - ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log" ;;;;;; "erc/erc-log.el" (17778 50473)) ;;; Generated autoloads from erc/erc-log.el @@ -9512,7 +9560,7 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17396 42169)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17817 13983)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) @@ -9569,8 +9617,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17390 -;;;;;; 26939)) +;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17817 +;;;;;; 14118)) ;;; Generated autoloads from eshell/esh-test.el (autoload (quote eshell-test) "esh-test" "\ @@ -9581,7 +9629,7 @@ Test Eshell to verify that it works as expected. ;;;*** ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command -;;;;;; eshell) "eshell" "eshell/eshell.el" (17427 42815)) +;;;;;; eshell) "eshell" "eshell/eshell.el" (17817 14118)) ;;; Generated autoloads from eshell/eshell.el (autoload (quote eshell) "eshell" "\ @@ -9929,7 +9977,7 @@ for \\[find-tag] (which see). ;;;;;; ethio-fidel-to-sera-buffer ethio-fidel-to-sera-region ethio-sera-to-fidel-marker ;;;;;; ethio-sera-to-fidel-mail ethio-sera-to-fidel-mail-or-marker ;;;;;; ethio-sera-to-fidel-buffer ethio-sera-to-fidel-region setup-ethiopic-environment-internal) -;;;;;; "ethio-util" "language/ethio-util.el" (17549 5052)) +;;;;;; "ethio-util" "language/ethio-util.el" (17817 15478)) ;;; Generated autoloads from language/ethio-util.el (autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\ @@ -10124,7 +10172,7 @@ Transcribe Ethiopic characters in ASCII depending on the file extension. ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (17390 26944)) +;;;;;; (17817 14121)) ;;; Generated autoloads from net/eudc.el (autoload (quote eudc-set-server) "eudc" "\ @@ -10180,7 +10228,7 @@ This does nothing except loading eudc by autoload side-effect. ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline ;;;;;; eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary) -;;;;;; "eudc-bob" "net/eudc-bob.el" (17390 26944)) +;;;;;; "eudc-bob" "net/eudc-bob.el" (17817 14121)) ;;; Generated autoloads from net/eudc-bob.el (autoload (quote eudc-display-generic-binary) "eudc-bob" "\ @@ -10216,7 +10264,7 @@ Display a button for the JPEG DATA. ;;;*** ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb) -;;;;;; "eudc-export" "net/eudc-export.el" (17390 26944)) +;;;;;; "eudc-export" "net/eudc-export.el" (17817 14121)) ;;; Generated autoloads from net/eudc-export.el (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\ @@ -10233,7 +10281,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el" -;;;;;; (17390 26944)) +;;;;;; (17817 14121)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\ @@ -10243,8 +10291,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17549 -;;;;;; 4607)) +;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17817 +;;;;;; 13982)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload (quote ewoc-create) "ewoc" "\ @@ -10315,7 +10363,7 @@ file modes. ;;;*** ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot -;;;;;; expand-add-abbrevs) "expand" "expand.el" (17778 50473)) +;;;;;; expand-add-abbrevs) "expand" "expand.el" (17817 13975)) ;;; Generated autoloads from expand.el (autoload (quote expand-add-abbrevs) "expand" "\ @@ -10358,7 +10406,7 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17778 50475)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17817 13977)) ;;; Generated autoloads from progmodes/f90.el (autoload (quote f90-mode) "f90" "\ @@ -10425,7 +10473,7 @@ with no args, if that value is non-nil. ;;;;;; facemenu-remove-all facemenu-remove-face-props facemenu-set-read-only ;;;;;; facemenu-set-intangible facemenu-set-invisible facemenu-set-face-from-menu ;;;;;; facemenu-set-background facemenu-set-foreground facemenu-set-face) -;;;;;; "facemenu" "facemenu.el" (17778 50473)) +;;;;;; "facemenu" "facemenu.el" (17817 13971)) ;;; Generated autoloads from facemenu.el (define-key global-map "\M-o" 'facemenu-keymap) (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap) @@ -10593,7 +10641,7 @@ argument BUFFER-NAME is nil, it defaults to *Colors*. ;;;*** ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock" -;;;;;; "obsolete/fast-lock.el" (17713 5990)) +;;;;;; "obsolete/fast-lock.el" (17817 14122)) ;;; Generated autoloads from obsolete/fast-lock.el (autoload (quote fast-lock-mode) "fast-lock" "\ @@ -10688,7 +10736,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu -;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17778 50473)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17817 13975)) ;;; Generated autoloads from ffap.el (autoload (quote ffap-next) "ffap" "\ @@ -10747,7 +10795,7 @@ Evaluate the forms in variable `ffap-bindings'. ;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively ;;;;;; file-cache-add-directory-using-locate file-cache-add-directory-using-find ;;;;;; file-cache-add-file file-cache-add-directory-list file-cache-add-directory) -;;;;;; "filecache" "filecache.el" (17713 5989)) +;;;;;; "filecache" "filecache.el" (17817 13975)) ;;; Generated autoloads from filecache.el (autoload (quote file-cache-add-directory) "filecache" "\ @@ -10818,7 +10866,7 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "fill" "textmodes/fill.el" (17778 50479)) +;;;### (autoloads nil "fill" "textmodes/fill.el" (17817 16882)) ;;; Generated autoloads from textmodes/fill.el (put 'colon-double-space 'safe-local-variable 'booleanp) @@ -10826,7 +10874,7 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (17713 5989)) +;;;;;; (17817 13975)) ;;; Generated autoloads from find-dired.el (defvar find-ls-option (if (eq system-type (quote berkeley-unix)) (quote ("-ls" . "-gilsb")) (quote ("-exec ls -ld {} \\;" . "-ld"))) "\ @@ -10887,7 +10935,7 @@ Thus ARG can also contain additional grep options. ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file ;;;;;; ff-find-other-file ff-get-other-file) "find-file" "find-file.el" -;;;;;; (17611 8432)) +;;;;;; (17817 13975)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs (quote (("^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" lambda nil (buffer-substring (match-beginning 2) (match-end 2))))) "\ @@ -10981,7 +11029,7 @@ Visit the file you click on in another window. ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (17778 50473)) +;;;;;; "emacs-lisp/find-func.el" (17817 14115)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload (quote find-library) "find-func" "\ @@ -11056,7 +11104,7 @@ The library where VARIABLE is defined is searched for in FILE or \(fn VARIABLE &optional FILE)" nil nil) (autoload (quote find-variable) "find-func" "\ -Find the definition of the VARIABLE near point. +Find the definition of the VARIABLE at or before point. Finds the library containing the definition of the variable near point (selected by `variable-at-point') in a buffer and @@ -11135,7 +11183,7 @@ Define some key bindings for the find-function family of functions. ;;;*** ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories -;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17396 42165)) +;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17817 13975)) ;;; Generated autoloads from find-lisp.el (autoload (quote find-lisp-find-dired) "find-lisp" "\ @@ -11178,7 +11226,7 @@ Find packages matching a given keyword. ;;;*** ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl" -;;;;;; "flow-ctrl.el" (17390 26939)) +;;;;;; "flow-ctrl.el" (17817 13975)) ;;; Generated autoloads from flow-ctrl.el (autoload (quote enable-flow-control) "flow-ctrl" "\ @@ -11240,7 +11288,7 @@ Turn flymake mode off. ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (17778 50479)) +;;;;;; "flyspell" "textmodes/flyspell.el" (17817 14127)) ;;; Generated autoloads from textmodes/flyspell.el (autoload (quote flyspell-prog-mode) "flyspell" "\ @@ -11383,8 +11431,8 @@ in your `~/.emacs' file, replacing [f7] by your favourite key: ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17390 -;;;;;; 26942)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17817 +;;;;;; 16161)) ;;; Generated autoloads from mail/footnote.el (autoload (quote footnote-mode) "footnote" "\ @@ -11405,7 +11453,7 @@ key binding ;;;*** ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (17390 26939)) +;;;;;; "forms" "forms.el" (17817 13976)) ;;; Generated autoloads from forms.el (autoload (quote forms-mode) "forms" "\ @@ -11442,7 +11490,7 @@ Visit a file in Forms mode in other window. ;;;*** ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran" -;;;;;; "progmodes/fortran.el" (17778 50475)) +;;;;;; "progmodes/fortran.el" (17817 13977)) ;;; Generated autoloads from progmodes/fortran.el (defvar fortran-tab-mode-default nil "\ @@ -11578,7 +11626,7 @@ and choose the directory as the fortune-file. ;;;*** ;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el" -;;;;;; (17778 50475)) +;;;;;; (17817 16161)) ;;; Generated autoloads from progmodes/gdb-ui.el (autoload (quote gdba) "gdb-ui" "\ @@ -11641,8 +11689,8 @@ Non-nil means record the process input and output in `gdb-debug-ring'.") ;;;*** ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal -;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17390 -;;;;;; 26938)) +;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17817 +;;;;;; 13982)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11717,7 +11765,7 @@ regular expression that can be used as an element of ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (17778 50476)) +;;;;;; (17817 14147)) ;;; Generated autoloads from progmodes/glasses.el (autoload (quote glasses-mode) "glasses" "\ @@ -11921,7 +11969,7 @@ If CLEAN, obsolete (ignore). ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (17778 50473)) +;;;;;; (17817 16940)) ;;; Generated autoloads from gnus/gnus-art.el (autoload (quote gnus-article-prepare-display) "gnus-art" "\ @@ -11932,7 +11980,7 @@ Make the current buffer look like a nice article. ;;;*** ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el" -;;;;;; (17383 38805)) +;;;;;; (17817 14137)) ;;; Generated autoloads from gnus/gnus-audio.el (autoload (quote gnus-audio-play) "gnus-audio" "\ @@ -12023,7 +12071,7 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** ;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d) -;;;;;; "gnus-diary" "gnus/gnus-diary.el" (17778 50473)) +;;;;;; "gnus-diary" "gnus/gnus-diary.el" (17817 15855)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload (quote gnus-user-format-function-d) "gnus-diary" "\ @@ -12102,7 +12150,7 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (17778 50473)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (17817 16148)) ;;; Generated autoloads from gnus/gnus-group.el (autoload (quote gnus-fetch-group) "gnus-group" "\ @@ -12119,7 +12167,7 @@ Pop up a frame and enter GROUP. ;;;*** ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el" -;;;;;; (17383 38805)) +;;;;;; (17817 14137)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias (quote gnus-batch-kill) (quote gnus-batch-score)) @@ -12260,7 +12308,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el" -;;;;;; (17383 38805)) +;;;;;; (17817 14137)) ;;; Generated autoloads from gnus/gnus-move.el (autoload (quote gnus-change-server) "gnus-move" "\ @@ -12297,7 +12345,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads (gnus-nocem-load-cache gnus-nocem-scan-groups) -;;;;;; "gnus-nocem" "gnus/gnus-nocem.el" (17427 41288)) +;;;;;; "gnus-nocem" "gnus/gnus-nocem.el" (17817 14137)) ;;; Generated autoloads from gnus/gnus-nocem.el (autoload (quote gnus-nocem-scan-groups) "gnus-nocem" "\ @@ -12454,7 +12502,7 @@ Not documented ;;;*** ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el" -;;;;;; (17383 38805)) +;;;;;; (17817 14137)) ;;; Generated autoloads from gnus/gnus-soup.el (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\ @@ -12720,7 +12768,7 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** ;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx -;;;;;; sdb gdb) "gud" "progmodes/gud.el" (17778 50476)) +;;;;;; sdb gdb) "gud" "progmodes/gud.el" (17817 13989)) ;;; Generated autoloads from progmodes/gud.el (autoload (quote gdb) "gud" "\ @@ -12810,8 +12858,8 @@ Major mode for editing GDB scripts ;;;*** -;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17778 -;;;;;; 50475)) +;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17817 +;;;;;; 14125)) ;;; Generated autoloads from play/handwrite.el (autoload (quote handwrite) "handwrite" "\ @@ -12989,7 +13037,7 @@ different regions. With numeric argument ARG, behaves like ;;;### (autoloads (describe-categories describe-syntax describe-variable ;;;;;; variable-at-point describe-function-1 describe-simplify-lib-file-name ;;;;;; help-C-file-name describe-function) "help-fns" "help-fns.el" -;;;;;; (17778 50473)) +;;;;;; (17817 15855)) ;;; Generated autoloads from help-fns.el (autoload (quote describe-function) "help-fns" "\ @@ -13014,7 +13062,7 @@ Not documented \(fn FUNCTION)" nil nil) (autoload (quote variable-at-point) "help-fns" "\ -Return the bound variable symbol found around point. +Return the bound variable symbol found at or before point. Return 0 if there is no such symbol. If ANY-SYMBOL is non-nil, don't insist the symbol be bound. @@ -13047,7 +13095,7 @@ BUFFER should be a buffer or a buffer name. ;;;*** ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el" -;;;;;; (17778 50473)) +;;;;;; (17817 13976)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13146,7 +13194,7 @@ Add xrefs for symbols in `pp's output between FROM and TO. ;;;*** ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper" -;;;;;; "emacs-lisp/helper.el" (17591 9619)) +;;;;;; "emacs-lisp/helper.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload (quote Helper-describe-bindings) "helper" "\ @@ -13498,7 +13546,7 @@ Key bindings: ;;;;;; highlight-compare-buffers highlight-changes-rotate-faces ;;;;;; highlight-changes-previous-change highlight-changes-next-change ;;;;;; highlight-changes-mode highlight-changes-remove-highlight) -;;;;;; "hilit-chg" "hilit-chg.el" (17390 27370)) +;;;;;; "hilit-chg" "hilit-chg.el" (17817 13976)) ;;; Generated autoloads from hilit-chg.el (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\ @@ -13628,7 +13676,7 @@ variable `highlight-changes-global-changes-existing-buffers' is non-nil). ;;;;;; hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction ;;;;;; hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space ;;;;;; hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp" -;;;;;; "hippie-exp.el" (17390 26939)) +;;;;;; "hippie-exp.el" (17817 13976)) ;;; Generated autoloads from hippie-exp.el (defvar hippie-expand-try-functions-list (quote (try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol)) "\ @@ -13636,40 +13684,40 @@ The list of expansion functions tried in order by `hippie-expand'. To change the behavior of `hippie-expand', remove, change the order of, or insert functions in this list.") -(custom-autoload (quote hippie-expand-try-functions-list) "hippie-exp") +(custom-autoload (quote hippie-expand-try-functions-list) "hippie-exp" t) (defvar hippie-expand-verbose t "\ *Non-nil makes `hippie-expand' output which function it is trying.") -(custom-autoload (quote hippie-expand-verbose) "hippie-exp") +(custom-autoload (quote hippie-expand-verbose) "hippie-exp" t) (defvar hippie-expand-dabbrev-skip-space nil "\ *Non-nil means tolerate trailing spaces in the abbreviation to expand.") -(custom-autoload (quote hippie-expand-dabbrev-skip-space) "hippie-exp") +(custom-autoload (quote hippie-expand-dabbrev-skip-space) "hippie-exp" t) (defvar hippie-expand-dabbrev-as-symbol t "\ *Non-nil means expand as symbols, i.e. syntax `_' is considered a letter.") -(custom-autoload (quote hippie-expand-dabbrev-as-symbol) "hippie-exp") +(custom-autoload (quote hippie-expand-dabbrev-as-symbol) "hippie-exp" t) (defvar hippie-expand-no-restriction t "\ *Non-nil means that narrowed buffers are widened during search.") -(custom-autoload (quote hippie-expand-no-restriction) "hippie-exp") +(custom-autoload (quote hippie-expand-no-restriction) "hippie-exp" t) (defvar hippie-expand-max-buffers nil "\ *The maximum number of buffers (apart from the current) searched. If nil, all buffers are searched.") -(custom-autoload (quote hippie-expand-max-buffers) "hippie-exp") +(custom-autoload (quote hippie-expand-max-buffers) "hippie-exp" t) (defvar hippie-expand-ignore-buffers (quote ("^ \\*.*\\*$" dired-mode)) "\ *A list specifying which buffers not to search (if not current). Can contain both regexps matching buffer names (as strings) and major modes \(as atoms)") -(custom-autoload (quote hippie-expand-ignore-buffers) "hippie-exp") +(custom-autoload (quote hippie-expand-ignore-buffers) "hippie-exp" t) (defvar hippie-expand-only-buffers nil "\ *A list specifying the only buffers to search (in addition to current). @@ -13677,7 +13725,7 @@ Can contain both regexps matching buffer names (as strings) and major modes \(as atoms). If non-nil, this variable overrides the variable `hippie-expand-ignore-buffers'.") -(custom-autoload (quote hippie-expand-only-buffers) "hippie-exp") +(custom-autoload (quote hippie-expand-only-buffers) "hippie-exp" t) (autoload (quote hippie-expand) "hippie-exp" "\ Try to expand text before point, using multiple methods. @@ -13779,7 +13827,7 @@ The optional LABEL is used to label the buffer created. ;;;*** ;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll) -;;;;;; "hscroll" "obsolete/hscroll.el" (17383 38806)) +;;;;;; "hscroll" "obsolete/hscroll.el" (17817 14122)) ;;; Generated autoloads from obsolete/hscroll.el (autoload (quote turn-on-hscroll) "hscroll" "\ @@ -14335,7 +14383,7 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (17401 60141)) +;;;;;; "calendar/icalendar.el" (17817 15855)) ;;; Generated autoloads from calendar/icalendar.el (autoload (quote icalendar-export-file) "icalendar" "\ @@ -14475,7 +14523,7 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (17778 50476)) +;;;;;; (17817 14147)) ;;; Generated autoloads from progmodes/idlwave.el (autoload (quote idlwave-mode) "idlwave" "\ @@ -14610,8 +14658,8 @@ The main features of this mode are ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17778 -;;;;;; 50473)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17817 +;;;;;; 16161)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14872,7 +14920,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (17390 26940)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (17817 13976)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names "*ielm*") @@ -14901,10 +14949,10 @@ Toggle inline image minor mode. ;;;*** ;;;### (autoloads (defimage find-image remove-images insert-sliced-image -;;;;;; insert-image put-image create-image image-type-available-p -;;;;;; image-type image-type-from-file-name image-type-from-file-header -;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (17490 7905)) +;;;;;; insert-image put-image create-image image-type-auto-detected-p +;;;;;; image-type-available-p image-type image-type-from-file-name +;;;;;; image-type-from-file-header image-type-from-buffer image-type-from-data) +;;;;;; "image" "image.el" (17817 16882)) ;;; Generated autoloads from image.el (autoload (quote image-type-from-data) "image" "\ @@ -14952,6 +15000,15 @@ Image types are symbols like `xbm' or `jpeg'. \(fn TYPE)" nil nil) +(autoload (quote image-type-auto-detected-p) "image" "\ +Return t iff the current buffer contains an auto-detectable image. +Whether image types are auto-detectable or not depends on the setting +of the variable `image-type-auto-detectable'. + +This function is intended to be used from `magic-mode-alist' (which see). + +\(fn)" nil nil) + (autoload (quote create-image) "image" "\ Create an image. FILE-OR-DATA is an image file name or image data. @@ -15167,7 +15224,7 @@ information on these modes. ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (17713 5990)) +;;;;;; imenu-sort-function) "imenu" "imenu.el" (17817 13976)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15282,7 +15339,7 @@ for more information. ;;;### (autoloads (indian-char-glyph indian-glyph-char in-is13194-pre-write-conversion ;;;;;; in-is13194-post-read-conversion indian-compose-string indian-compose-region) -;;;;;; "ind-util" "language/ind-util.el" (17342 36796)) +;;;;;; "ind-util" "language/ind-util.el" (17817 14144)) ;;; Generated autoloads from language/ind-util.el (autoload (quote indian-compose-region) "ind-util" "\ @@ -15392,7 +15449,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node ;;;;;; Info-goto-emacs-command-node Info-mode info-apropos Info-index ;;;;;; Info-directory Info-on-current-buffer info-standalone info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (17713 5990)) +;;;;;; info info-other-window) "info" "info.el" (17817 16152)) ;;; Generated autoloads from info.el (autoload (quote info-other-window) "info" "\ @@ -15633,7 +15690,7 @@ quite a while. ;;;*** ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify) -;;;;;; "informat" "informat.el" (17390 26940)) +;;;;;; "informat" "informat.el" (17817 13976)) ;;; Generated autoloads from informat.el (autoload (quote Info-tagify) "informat" "\ @@ -15674,7 +15731,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method ;;;;;; isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el" -;;;;;; (17279 27123)) +;;;;;; (17817 15477)) ;;; Generated autoloads from international/isearch-x.el (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\ @@ -15694,8 +15751,8 @@ Not documented ;;;*** -;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17390 -;;;;;; 26940)) +;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17817 +;;;;;; 15738)) ;;; Generated autoloads from isearchb.el (autoload (quote isearchb-activate) "isearchb" "\ @@ -15742,7 +15799,7 @@ and a negative argument disables it. ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only ;;;;;; iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso ;;;;;; iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt" -;;;;;; "international/iso-cvt.el" (17279 27079)) +;;;;;; "international/iso-cvt.el" (17817 14140)) ;;; Generated autoloads from international/iso-cvt.el (autoload (quote iso-spanish) "iso-cvt" "\ @@ -15826,7 +15883,7 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (17279 27115)) +;;;;;; (17817 14140)) ;;; Generated autoloads from international/iso-transl.el (or key-translation-map (setq key-translation-map (make-sparse-keymap))) (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) @@ -16154,7 +16211,7 @@ This mode enables switching between buffers using substrings. See ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region ;;;;;; japanese-hiragana-region japanese-katakana-region japanese-zenkaku ;;;;;; japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal) -;;;;;; "japan-util" "language/japan-util.el" (17279 27080)) +;;;;;; "japan-util" "language/japan-util.el" (17817 15478)) ;;; Generated autoloads from language/japan-util.el (autoload (quote setup-japanese-environment-internal) "japan-util" "\ @@ -16232,7 +16289,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" -;;;;;; "jka-compr.el" (17411 12435)) +;;;;;; "jka-compr.el" (17817 13976)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16313,7 +16370,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el" -;;;;;; (17307 17630)) +;;;;;; (17817 15477)) ;;; Generated autoloads from international/kinsoku.el (autoload (quote kinsoku) "kinsoku" "\ @@ -16334,8 +16391,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17778 -;;;;;; 49121)) +;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17817 +;;;;;; 15477)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16467,7 +16524,7 @@ If kbd macro currently being defined end it before activating it. ;;;### (autoloads (kannada-post-read-conversion kannada-compose-string ;;;;;; kannada-compose-region) "knd-util" "language/knd-util.el" -;;;;;; (17279 27080)) +;;;;;; (17817 14145)) ;;; Generated autoloads from language/knd-util.el (defconst kannada-consonant "[\x51f75-\x51fb9]") @@ -16490,7 +16547,7 @@ Not documented ;;;*** ;;;### (autoloads (setup-korean-environment-internal) "korea-util" -;;;;;; "language/korea-util.el" (17279 27080)) +;;;;;; "language/korea-util.el" (17817 15478)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "") "\ @@ -16505,7 +16562,7 @@ Not documented ;;;*** ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el" -;;;;;; (17778 50475)) +;;;;;; (17817 14125)) ;;; Generated autoloads from play/landmark.el (defalias (quote landmark-repeat) (quote lm-test-run)) @@ -16539,8 +16596,8 @@ Use \\[describe-mode] for more info. ;;;### (autoloads (lao-compose-region lao-composition-function lao-post-read-conversion ;;;;;; lao-transcribe-roman-to-lao-string lao-transcribe-single-roman-syllable-to-lao -;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17279 -;;;;;; 27080)) +;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17817 +;;;;;; 15478)) ;;; Generated autoloads from language/lao-util.el (autoload (quote lao-compose-string) "lao-util" "\ @@ -16621,7 +16678,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display) -;;;;;; "latin1-disp" "international/latin1-disp.el" (17279 27079)) +;;;;;; "latin1-disp" "international/latin1-disp.el" (17817 14141)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16639,7 +16696,7 @@ charsets if you don't have a Unicode font with which to display them. Setting this variable directly does not take effect; use either \\[customize] or the function `latin1-display'.") -(custom-autoload (quote latin1-display) "latin1-disp") +(custom-autoload (quote latin1-display) "latin1-disp" nil) (autoload (quote latin1-display) "latin1-disp" "\ Set up Latin-1/ASCII display for the arguments character SETS. @@ -16660,7 +16717,7 @@ changed if the display can render Unicode characters. Setting this variable directly does not take effect; use either \\[customize] or the function `latin1-display'.") -(custom-autoload (quote latin1-display-ucs-per-lynx) "latin1-disp") +(custom-autoload (quote latin1-display-ucs-per-lynx) "latin1-disp" nil) ;;;*** @@ -16733,7 +16790,7 @@ Unconditionally turn on Lazy Lock mode. ;;;*** ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el" -;;;;;; (17611 9419)) +;;;;;; (17817 14147)) ;;; Generated autoloads from progmodes/ld-script.el (add-to-list (quote auto-mode-alist) (quote ("\\.ld[si]?\\>" . ld-script-mode))) @@ -16748,7 +16805,7 @@ A major mode to edit GNU ld script files ;;;*** ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el" -;;;;;; (17778 50475)) +;;;;;; (17817 13976)) ;;; Generated autoloads from ledit.el (defconst ledit-save-files t "\ @@ -16796,8 +16853,8 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17778 -;;;;;; 50475)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17817 +;;;;;; 13976)) ;;; Generated autoloads from loadhist.el (autoload (quote unload-feature) "loadhist" "\ @@ -16867,7 +16924,7 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17496 38723)) +;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17817 13976)) ;;; Generated autoloads from log-edit.el (autoload (quote log-edit) "log-edit" "\ @@ -17016,14 +17073,14 @@ for further customization of the printer command. ;;;*** ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el" -;;;;;; (17390 26942)) +;;;;;; (17817 13976)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ *Non-nil means ls-lisp treats file patterns as shell wildcards. Otherwise they are treated as Emacs regexps (for backward compatibility).") -(custom-autoload (quote ls-lisp-support-shell-wildcards) "ls-lisp") +(custom-autoload (quote ls-lisp-support-shell-wildcards) "ls-lisp" t) ;;;*** @@ -17068,7 +17125,7 @@ definitions to shadow the loaded ones for use in file byte-compilation. ;;;*** ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro -;;;;;; name-last-kbd-macro) "macros" "macros.el" (17778 50475)) +;;;;;; name-last-kbd-macro) "macros" "macros.el" (17817 13976)) ;;; Generated autoloads from macros.el (autoload (quote name-last-kbd-macro) "macros" "\ @@ -17189,7 +17246,7 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history ;;;;;; mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el" -;;;;;; (17390 26942)) +;;;;;; (17817 14119)) ;;; Generated autoloads from mail/mail-hist.el (autoload (quote mail-hist-define-keys) "mail-hist" "\ @@ -17205,7 +17262,7 @@ Not documented (defvar mail-hist-keep-history t "\ *Non-nil means keep a history for headers and text of outgoing mail.") -(custom-autoload (quote mail-hist-keep-history) "mail-hist") +(custom-autoload (quote mail-hist-keep-history) "mail-hist" t) (autoload (quote mail-hist-put-headers-into-history) "mail-hist" "\ Put headers and contents of this message into mail header history. @@ -17273,7 +17330,7 @@ If 4th arg LIST is non-nil, return a list of all such fields. ;;;*** ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup) -;;;;;; "mailabbrev" "mail/mailabbrev.el" (17390 26942)) +;;;;;; "mailabbrev" "mail/mailabbrev.el" (17817 14119)) ;;; Generated autoloads from mail/mailabbrev.el (autoload (quote mail-abbrevs-setup) "mailabbrev" "\ @@ -17296,8 +17353,8 @@ If DEFINITION contains multiple addresses, separate them with commas. ;;;*** ;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases -;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17390 -;;;;;; 26942)) +;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17817 +;;;;;; 14119)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style (quote angles) "\ @@ -17309,7 +17366,7 @@ If `parens', they look like: If `angles', they look like: Elvis Parsley <king@grassland.com>") -(custom-autoload (quote mail-complete-style) "mailalias") +(custom-autoload (quote mail-complete-style) "mailalias" t) (autoload (quote expand-mail-aliases) "mailalias" "\ Expand all mail aliases in suitable header fields found between BEG and END. @@ -17474,8 +17531,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17390 -;;;;;; 26943)) +;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17817 +;;;;;; 13976)) ;;; Generated autoloads from makesum.el (autoload (quote make-command-summary) "makesum" "\ @@ -17486,7 +17543,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads (man-follow man) "man" "man.el" (17713 5990)) +;;;### (autoloads (man-follow man) "man" "man.el" (17817 14146)) ;;; Generated autoloads from man.el (defalias (quote manual-entry) (quote man)) @@ -17513,7 +17570,7 @@ Get a Un*x manual page of the item under point and put it in a buffer. ;;;*** -;;;### (autoloads (master-mode) "master" "master.el" (17279 27123)) +;;;### (autoloads (master-mode) "master" "master.el" (17817 13976)) ;;; Generated autoloads from master.el (autoload (quote master-mode) "master" "\ @@ -17535,8 +17592,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17778 -;;;;;; 50475)) +;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17817 +;;;;;; 15287)) ;;; Generated autoloads from menu-bar.el (put (quote menu-bar-mode) (quote standard-value) (quote (t))) @@ -17571,7 +17628,7 @@ turn on menu bars; otherwise, turn off menu bars. ;;;;;; message-cite-function message-yank-prefix message-citation-line-function ;;;;;; message-send-mail-function message-user-organization-file ;;;;;; message-signature-separator message-from-style) "message" -;;;;;; "gnus/message.el" (17778 50473)) +;;;;;; "gnus/message.el" (17817 16940)) ;;; Generated autoloads from gnus/message.el (defvar message-from-style (quote default) "\ @@ -17852,7 +17909,7 @@ Turning on MetaPost mode calls the value of the variable ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body ;;;;;; metamail-interpret-header) "metamail" "mail/metamail.el" -;;;;;; (17390 26942)) +;;;;;; (17817 14119)) ;;; Generated autoloads from mail/metamail.el (autoload (quote metamail-interpret-header) "metamail" "\ @@ -18083,7 +18140,7 @@ perform the operation on all messages in that region. ;;;*** ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight" -;;;;;; "midnight.el" (17778 49127)) +;;;;;; "midnight.el" (17817 13976)) ;;; Generated autoloads from midnight.el (autoload (quote clean-buffer-list) "midnight" "\ @@ -18154,7 +18211,7 @@ Major mode for the mixal asm language. ;;;### (autoloads (malayalam-composition-function malayalam-post-read-conversion ;;;;;; malayalam-compose-region) "mlm-util" "language/mlm-util.el" -;;;;;; (17342 36796)) +;;;;;; (17817 14145)) ;;; Generated autoloads from language/mlm-util.el (autoload (quote malayalam-compose-region) "mlm-util" "\ @@ -18210,7 +18267,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (17611 9417)) +;;;;;; "mm-url" "gnus/mm-url.el" (17817 13970)) ;;; Generated autoloads from gnus/mm-url.el (autoload (quote mm-url-insert-file-contents) "mm-url" "\ @@ -18337,7 +18394,7 @@ followed by the first character of the construct. ;;;*** ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el" -;;;;;; (17383 38807)) +;;;;;; (17817 14125)) ;;; Generated autoloads from play/morse.el (autoload (quote morse-region) "morse" "\ @@ -18352,8 +18409,8 @@ Convert morse coded text in region to ordinary ASCII text. ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17713 -;;;;;; 5990)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17817 +;;;;;; 14147)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ @@ -18405,7 +18462,7 @@ primary selection and region. ;;;*** -;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17383 38807)) +;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17817 14125)) ;;; Generated autoloads from play/mpuz.el (autoload (quote mpuz) "mpuz" "\ @@ -18441,7 +18498,7 @@ different buffer menu using the function `msb'. ;;;;;; describe-current-coding-system describe-current-coding-system-briefly ;;;;;; describe-coding-system describe-character-set list-charset-chars ;;;;;; read-charset list-character-sets) "mule-diag" "international/mule-diag.el" -;;;;;; (17713 2489)) +;;;;;; (17817 15478)) ;;; Generated autoloads from international/mule-diag.el (defvar non-iso-charset-alist (\` ((mac-roman (ascii latin-iso8859-1 mule-unicode-2500-33ff mule-unicode-0100-24ff mule-unicode-e000-ffff) mac-roman-decoder ((0 255))) (viscii (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-viscii-nonascii-translation-table ((0 255))) (vietnamese-tcvn (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-tcvn-nonascii-translation-table ((0 255))) (koi8-r (ascii cyrillic-iso8859-5) cyrillic-koi8-r-nonascii-translation-table ((32 255))) (alternativnyj (ascii cyrillic-iso8859-5) cyrillic-alternativnyj-nonascii-translation-table ((32 255))) (koi8-u (ascii cyrillic-iso8859-5 mule-unicode-0100-24ff) cyrillic-koi8-u-nonascii-translation-table ((32 255))) (big5 (ascii chinese-big5-1 chinese-big5-2) decode-big5-char ((32 127) ((161 254) 64 126 161 254))) (sjis (ascii katakana-jisx0201 japanese-jisx0208) decode-sjis-char ((32 127 161 223) ((129 159 224 239) 64 126 128 252))))) "\ @@ -18615,7 +18672,7 @@ system which uses fontsets). ;;;;;; coding-system-translation-table-for-decode coding-system-pre-write-conversion ;;;;;; coding-system-post-read-conversion lookup-nested-alist set-nested-alist ;;;;;; truncate-string-to-width store-substring string-to-sequence) -;;;;;; "mule-util" "international/mule-util.el" (17279 27079)) +;;;;;; "mule-util" "international/mule-util.el" (17817 15478)) ;;; Generated autoloads from international/mule-util.el (autoload (quote string-to-sequence) "mule-util" "\ @@ -18868,7 +18925,7 @@ Open a network connection to HOST on PORT. ;;;;;; uncomment-region comment-kill comment-set-column comment-indent ;;;;;; comment-indent-default comment-normalize-vars comment-multi-line ;;;;;; comment-padding comment-style comment-column) "newcomment" -;;;;;; "newcomment.el" (17778 50475)) +;;;;;; "newcomment.el" (17817 13976)) ;;; Generated autoloads from newcomment.el (defalias (quote indent-for-comment) (quote comment-indent)) @@ -19144,7 +19201,7 @@ This command does not work if you use short group names. ;;;*** ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el" -;;;;;; (17383 38805)) +;;;;;; (17817 14138)) ;;; Generated autoloads from gnus/nnkiboze.el (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\ @@ -19188,7 +19245,7 @@ Revert posting and mailing methods to the standard Emacs methods. ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (17778 50475)) +;;;;;; "novice" "novice.el" (17817 13976)) ;;; Generated autoloads from novice.el (defvar disabled-command-function (quote disabled-command-function) "\ @@ -19273,7 +19330,7 @@ startup file, `~/.emacs-octave'. ;;;*** ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el" -;;;;;; (17427 42815)) +;;;;;; (17817 13977)) ;;; Generated autoloads from progmodes/octave-mod.el (autoload (quote octave-mode) "octave-mod" "\ @@ -19372,7 +19429,7 @@ including a reproducible test case and send the message. ;;;*** ;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el" -;;;;;; (17569 17776)) +;;;;;; (17817 14123)) ;;; Generated autoloads from obsolete/options.el (autoload (quote list-options) "options" "\ @@ -19399,7 +19456,7 @@ The Custom feature is intended to make this obsolete. ;;;;;; org-store-link org-tags-view org-diary org-cycle-agenda-files ;;;;;; org-todo-list org-agenda-list org-batch-agenda org-agenda ;;;;;; org-global-cycle org-cycle org-mode) "org" "textmodes/org.el" -;;;;;; (17778 50479)) +;;;;;; (17817 15940)) ;;; Generated autoloads from textmodes/org.el (autoload (quote org-mode) "org" "\ @@ -19667,7 +19724,7 @@ The file is stored under the name `org-combined-agenda-icalendar-file'. ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (17515 24859)) +;;;;;; (17817 16152)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'string-or-null-p) @@ -19829,7 +19886,7 @@ no args, if that value is non-nil. ;;;*** ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el" -;;;;;; (17390 26938)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emulation/pc-mode.el (autoload (quote pc-bindings-mode) "pc-mode" "\ @@ -19924,8 +19981,8 @@ you must modify it using \\[customize] or \\[pc-selection-mode].") ;;;*** -;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17390 -;;;;;; 26944)) +;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17817 +;;;;;; 13976)) ;;; Generated autoloads from pcmpl-cvs.el (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\ @@ -19936,7 +19993,7 @@ Completion rules for the `cvs' command. ;;;*** ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip) -;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17390 26944)) +;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17817 13976)) ;;; Generated autoloads from pcmpl-gnu.el (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\ @@ -19964,7 +20021,7 @@ Completion for the GNU tar utility. ;;;*** ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill) -;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17390 26944)) +;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17817 13976)) ;;; Generated autoloads from pcmpl-linux.el (autoload (quote pcomplete/kill) "pcmpl-linux" "\ @@ -19984,8 +20041,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17390 -;;;;;; 26944)) +;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17817 +;;;;;; 13976)) ;;; Generated autoloads from pcmpl-rpm.el (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\ @@ -20001,7 +20058,7 @@ You can use \\[eshell-report-bug] to do so. ;;;### (autoloads (pcomplete/chgrp pcomplete/chown pcomplete/which ;;;;;; pcomplete/xargs pcomplete/rm pcomplete/rmdir pcomplete/cd) -;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17390 26944)) +;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17817 13976)) ;;; Generated autoloads from pcmpl-unix.el (autoload (quote pcomplete/cd) "pcmpl-unix" "\ @@ -20107,7 +20164,7 @@ Setup shell-mode to use pcomplete. ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "pcvs.el" (17778 50475)) +;;;;;; "pcvs.el" (17817 13976)) ;;; Generated autoloads from pcvs.el (autoload (quote cvs-checkout) "pcvs" "\ @@ -20184,7 +20241,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17713 5990)) +;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17817 13976)) ;;; Generated autoloads from pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] (quote (menu-item "Directory Status" cvs-status :help "A more verbose status of a workarea"))) (define-key m [checkout] (quote (menu-item "Checkout Module" cvs-checkout :help "Check out a module from the repository"))) (define-key m [update] (quote (menu-item "Update Directory" cvs-update :help "Fetch updates from the repository"))) (define-key m [examine] (quote (menu-item "Examine Directory" cvs-examine :help "Examine the current state of a workarea"))) (fset (quote cvs-global-menu) m))) @@ -20384,7 +20441,7 @@ Import public keys in the current buffer. ;;;*** ;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el" -;;;;;; (17713 5990)) +;;;;;; (17817 16940)) ;;; Generated autoloads from pgg-gpg.el (autoload (quote pgg-gpg-symmetric-key-p) "pgg-gpg" "\ @@ -20395,7 +20452,7 @@ True if decoded armor MESSAGE-KEYS has symmetric encryption indicator. ;;;*** ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el" -;;;;;; (17466 28579)) +;;;;;; (17817 14128)) ;;; Generated autoloads from textmodes/picture.el (autoload (quote picture-mode) "picture" "\ @@ -20565,7 +20622,7 @@ Ignores leading comment characters. ;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview ;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript ;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el" -;;;;;; (17778 50475)) +;;;;;; (17817 13971)) ;;; Generated autoloads from printing.el (autoload (quote pr-interface) "printing" "\ @@ -21176,7 +21233,7 @@ With prefix argument \\[universal-prefix], prompt for the program to use. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17778 50476)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17817 15478)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\ @@ -21235,7 +21292,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number ;;;### (autoloads (ps-mule-begin-page ps-mule-begin-job ps-mule-encode-header-string ;;;;;; ps-mule-initialize ps-mule-plot-composition ps-mule-plot-string ;;;;;; ps-mule-set-ascii-font ps-mule-prepare-ascii-font ps-multibyte-buffer) -;;;;;; "ps-mule" "ps-mule.el" (17778 50476)) +;;;;;; "ps-mule" "ps-mule.el" (17817 13971)) ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ @@ -21356,8 +21413,8 @@ Not documented ;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type -;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17778 -;;;;;; 50476)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17817 +;;;;;; 13971)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\ @@ -21554,7 +21611,7 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (17778 50476)) +;;;;;; (17817 13957)) ;;; Generated autoloads from progmodes/python.el (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) @@ -21652,7 +21709,7 @@ them into characters should be done separately. ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (17713 5990)) +;;;;;; "international/quail.el" (17817 15478)) ;;; Generated autoloads from international/quail.el (autoload (quote quail-title) "quail" "\ @@ -21988,8 +22045,8 @@ Global minor mode for tracking activity in rcirc buffers. ;;;*** -;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17569 -;;;;;; 18006)) +;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17817 +;;;;;; 14122)) ;;; Generated autoloads from net/rcompile.el (autoload (quote remote-compile) "rcompile" "\ @@ -22169,8 +22226,8 @@ rectangle which were empty. ;;;*** -;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17390 -;;;;;; 26946)) +;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17817 +;;;;;; 14128)) ;;; Generated autoloads from textmodes/refill.el (autoload (quote refill-mode) "refill" "\ @@ -22236,7 +22293,7 @@ This enforces rescanning the buffer on next use. ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" -;;;;;; (17778 50479)) +;;;;;; (17817 14128)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload (quote reftex-citation) "reftex-cite" "\ @@ -22266,7 +22323,7 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" -;;;;;; (17713 5992)) +;;;;;; (17817 14128)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\ @@ -22283,7 +22340,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (17418 6743)) +;;;;;; (17817 14128)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload (quote reftex-index-phrases-mode) "reftex-index" "\ @@ -22316,7 +22373,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (17405 10316)) +;;;;;; (17817 14128)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload (quote reftex-all-document-files) "reftex-parse" "\ @@ -22328,8 +22385,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17713 -;;;;;; 5992)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17817 +;;;;;; 14129)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22339,7 +22396,7 @@ of master file. ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (17778 50473)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload (quote regexp-opt) "regexp-opt" "\ @@ -22366,7 +22423,7 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads (repeat) "repeat" "repeat.el" (17390 26945)) +;;;### (autoloads (repeat) "repeat" "repeat.el" (17817 13977)) ;;; Generated autoloads from repeat.el (autoload (quote repeat) "repeat" "\ @@ -22384,7 +22441,7 @@ can be modified by the global variable `repeat-on-final-keystroke'. ;;;*** ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el" -;;;;;; (17390 26943)) +;;;;;; (17817 14120)) ;;; Generated autoloads from mail/reporter.el (autoload (quote reporter-submit-bug-report) "reporter" "\ @@ -22416,7 +22473,7 @@ mail-sending package is used for editing and sending the message. ;;;*** ;;;### (autoloads (reposition-window) "reposition" "reposition.el" -;;;;;; (17390 26945)) +;;;;;; (17817 13977)) ;;; Generated autoloads from reposition.el (autoload (quote reposition-window) "reposition" "\ @@ -22443,8 +22500,8 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17778 -;;;;;; 50476)) +;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17817 +;;;;;; 13977)) ;;; Generated autoloads from resume.el (autoload (quote resume-suspend-hook) "resume" "\ @@ -22489,7 +22546,7 @@ With zero or negative ARG turn mode off. ;;;*** ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el" -;;;;;; (17390 26938)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload (quote ring-p) "ring" "\ @@ -22504,7 +22561,7 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17390 26944)) +;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17817 14122)) ;;; Generated autoloads from net/rlogin.el (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)") @@ -22872,7 +22929,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el" -;;;;;; (17390 26943)) +;;;;;; (17817 14120)) ;;; Generated autoloads from mail/rmailmsc.el (autoload (quote set-rmail-inbox-list) "rmailmsc" "\ @@ -23088,7 +23145,7 @@ Setting this variable has an effect only before reading a mail.") ;;;*** ;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el" -;;;;;; (17383 38807)) +;;;;;; (17817 14123)) ;;; Generated autoloads from obsolete/rnewspost.el (autoload (quote news-post-news) "rnewspost" "\ @@ -23101,7 +23158,7 @@ If NOQUERY is non-nil, we do not query before doing the work. ;;;*** ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region -;;;;;; rot13-string rot13) "rot13" "rot13.el" (17778 50476)) +;;;;;; rot13-string rot13) "rot13" "rot13.el" (17817 13977)) ;;; Generated autoloads from rot13.el (autoload (quote rot13) "rot13" "\ @@ -23142,38 +23199,38 @@ Toggle the use of ROT13 encoding for the current window. ;;;;;; resize-minibuffer-frame-max-height resize-minibuffer-frame ;;;;;; resize-minibuffer-window-exactly resize-minibuffer-window-max-height ;;;;;; resize-minibuffer-mode) "rsz-mini" "obsolete/rsz-mini.el" -;;;;;; (17383 38807)) +;;;;;; (17817 14123)) ;;; Generated autoloads from obsolete/rsz-mini.el (defvar resize-minibuffer-mode nil "\ *This variable is obsolete.") -(custom-autoload (quote resize-minibuffer-mode) "rsz-mini") +(custom-autoload (quote resize-minibuffer-mode) "rsz-mini" t) (defvar resize-minibuffer-window-max-height nil "\ *This variable is obsolete.") -(custom-autoload (quote resize-minibuffer-window-max-height) "rsz-mini") +(custom-autoload (quote resize-minibuffer-window-max-height) "rsz-mini" t) (defvar resize-minibuffer-window-exactly t "\ *This variable is obsolete.") -(custom-autoload (quote resize-minibuffer-window-exactly) "rsz-mini") +(custom-autoload (quote resize-minibuffer-window-exactly) "rsz-mini" t) (defvar resize-minibuffer-frame nil "\ *This variable is obsolete.") -(custom-autoload (quote resize-minibuffer-frame) "rsz-mini") +(custom-autoload (quote resize-minibuffer-frame) "rsz-mini" t) (defvar resize-minibuffer-frame-max-height nil "\ *This variable is obsolete.") -(custom-autoload (quote resize-minibuffer-frame-max-height) "rsz-mini") +(custom-autoload (quote resize-minibuffer-frame-max-height) "rsz-mini" t) (defvar resize-minibuffer-frame-exactly t "\ *This variable is obsolete.") -(custom-autoload (quote resize-minibuffer-frame-exactly) "rsz-mini") +(custom-autoload (quote resize-minibuffer-frame-exactly) "rsz-mini" t) (autoload (quote resize-minibuffer-mode) "rsz-mini" "\ This function is obsolete. @@ -23583,8 +23640,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17383 -;;;;;; 38807)) +;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17817 +;;;;;; 14123)) ;;; Generated autoloads from obsolete/scribe.el (autoload (quote scribe-mode) "scribe" "\ @@ -23609,7 +23666,7 @@ Interesting variables: ;;;*** ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el" -;;;;;; (17778 50476)) +;;;;;; (17817 13977)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -24018,7 +24075,7 @@ These are active only in the minibuffer, when entering or editing a formula: ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (17524 8650)) +;;;;;; (17817 13959)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload (quote sgml-mode) "sgml-mode" "\ @@ -24086,7 +24143,7 @@ To work around that, do: ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (17713 5991)) +;;;;;; (17817 16152)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24165,7 +24222,7 @@ If BINARY is non-nil, return a string in binary form. ;;;*** ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el" -;;;;;; (17778 50473)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload (quote list-load-path-shadows) "shadow" "\ @@ -24252,7 +24309,7 @@ Set up file shadowing. ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (17778 48451)) +;;;;;; (17817 15738)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\ @@ -24271,10 +24328,10 @@ If BUFFER exists but shell process is not running, make new shell. If BUFFER exists and shell process is running, just switch to BUFFER. Program used comes from variable `explicit-shell-file-name', or (if that is nil) from the ESHELL environment variable, - or else from SHELL if there is no ESHELL. -If a file `~/.emacs_SHELLNAME' exists, it is given as initial input - (Note that this may lose due to a timing error if the shell - discards input when it starts up.) + or (if that is nil) from `shell-file-name'. +If a file `~/.emacs_SHELLNAME' exists, or `~/.emacs.d/init_SHELLNAME.sh', +it is given as initial input (but this may be lost, due to a timing +error, if the shell discards input when it starts up). The buffer is put in Shell mode, giving commands for sending input and controlling the subjobs of the shell. See `shell-mode'. See also the variable `shell-prompt-pattern'. @@ -24335,14 +24392,14 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simple" "simple.el" (17778 50477)) +;;;### (autoloads nil "simple" "simple.el" (17817 16152)) ;;; Generated autoloads from simple.el (put 'fill-prefix 'safe-local-variable 'string-or-null-p) ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17390 -;;;;;; 27409)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17817 +;;;;;; 14147)) ;;; Generated autoloads from progmodes/simula.el (autoload (quote simula-mode) "simula" "\ @@ -24391,7 +24448,7 @@ with no arguments, if that value is non-nil. ;;;*** ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new -;;;;;; define-skeleton) "skeleton" "skeleton.el" (17524 8650)) +;;;;;; define-skeleton) "skeleton" "skeleton.el" (17817 13977)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function (quote identity) "\ @@ -24553,7 +24610,7 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads (snake) "snake" "play/snake.el" (17383 38807)) +;;;### (autoloads (snake) "snake" "play/snake.el" (17817 14125)) ;;; Generated autoloads from play/snake.el (autoload (quote snake) "snake" "\ @@ -24577,7 +24634,7 @@ Snake mode keybindings: ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (17390 26944)) +;;;;;; (17817 14122)) ;;; Generated autoloads from net/snmp-mode.el (autoload (quote snmp-mode) "snmp-mode" "\ @@ -24679,8 +24736,8 @@ Requires floating point. ;;;*** -;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17383 -;;;;;; 38807)) +;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17817 +;;;;;; 14125)) ;;; Generated autoloads from play/solitaire.el (autoload (quote solitaire) "solitaire" "\ @@ -24757,7 +24814,7 @@ Pick your favourite shortcuts: ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields ;;;;;; sort-fields sort-numeric-fields sort-pages sort-paragraphs -;;;;;; sort-lines sort-subr) "sort" "sort.el" (17778 50477)) +;;;;;; sort-lines sort-subr) "sort" "sort.el" (17817 13977)) ;;; Generated autoloads from sort.el (autoload (quote sort-subr) "sort" "\ @@ -24899,8 +24956,8 @@ From a program takes two point or marker arguments, BEG and END. ;;;*** -;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17441 -;;;;;; 26811)) +;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17817 +;;;;;; 16940)) ;;; Generated autoloads from gnus/spam.el (autoload (quote spam-initialize) "spam" "\ @@ -24980,7 +25037,7 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** ;;;### (autoloads (spell-string spell-region spell-word spell-buffer) -;;;;;; "spell" "textmodes/spell.el" (17390 26946)) +;;;;;; "spell" "textmodes/spell.el" (17817 14129)) ;;; Generated autoloads from textmodes/spell.el (put (quote spell-filter) (quote risky-local-variable) t) @@ -25016,8 +25073,8 @@ Check spelling of string supplied as argument. ;;;*** -;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17383 -;;;;;; 38807)) +;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17817 +;;;;;; 14125)) ;;; Generated autoloads from play/spook.el (autoload (quote spook) "spook" "\ @@ -25035,8 +25092,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-mode sql-help -;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17390 -;;;;;; 27409)) +;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17817 +;;;;;; 16161)) ;;; Generated autoloads from progmodes/sql.el (autoload (quote sql-add-product-keywords) "sql" "\ @@ -25467,8 +25524,8 @@ input. See `sql-interactive-mode'. ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17713 -;;;;;; 5991)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17817 +;;;;;; 13977)) ;;; Generated autoloads from strokes.el (autoload (quote strokes-global-set-stroke) "strokes" "\ @@ -25598,7 +25655,7 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads (locate-library) "subr" "subr.el" (17778 50477)) +;;;### (autoloads (locate-library) "subr" "subr.el" (17817 15467)) ;;; Generated autoloads from subr.el (autoload (quote locate-library) "subr" "\ @@ -25620,7 +25677,7 @@ and the file name is displayed in the echo area. ;;;*** ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el" -;;;;;; (17390 26943)) +;;;;;; (17817 14120)) ;;; Generated autoloads from mail/supercite.el (autoload (quote sc-cite-original) "supercite" "\ @@ -25674,7 +25731,7 @@ Turn it on to use Emacs mouse commands, and off to use t-mouse commands. ;;;*** -;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17778 50477)) +;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17817 13977)) ;;; Generated autoloads from tabify.el (autoload (quote untabify) "tabify" "\ @@ -26297,7 +26354,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads (talk talk-connect) "talk" "talk.el" (17390 26945)) +;;;### (autoloads (talk talk-connect) "talk" "talk.el" (17817 13977)) ;;; Generated autoloads from talk.el (autoload (quote talk-connect) "talk" "\ @@ -26387,7 +26444,7 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17390 26944)) +;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17817 14122)) ;;; Generated autoloads from net/telnet.el (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)") @@ -26414,8 +26471,8 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17778 -;;;;;; 50478)) +;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17817 +;;;;;; 13977)) ;;; Generated autoloads from term.el (autoload (quote make-term) "term" "\ @@ -26443,8 +26500,8 @@ Start a terminal-emulator in a new buffer. ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17778 -;;;;;; 50479)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17817 +;;;;;; 13977)) ;;; Generated autoloads from terminal.el (autoload (quote terminal-emulator) "terminal" "\ @@ -26491,7 +26548,7 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17383 38807)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17817 14126)) ;;; Generated autoloads from play/tetris.el (autoload (quote tetris) "tetris" "\ @@ -26522,13 +26579,13 @@ tetris-mode keybindings: ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (17569 17779)) +;;;;;; (17817 14129)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ *If non-nil, the shell file name to run in the subshell used to run TeX.") -(custom-autoload (quote tex-shell-file-name) "tex-mode") +(custom-autoload (quote tex-shell-file-name) "tex-mode" t) (defvar tex-directory "." "\ *Directory in which temporary files are written. @@ -26536,7 +26593,7 @@ You can make this `/tmp' if your TEXINPUTS has no relative directories in it and you don't try to apply \\[tex-region] or \\[tex-buffer] when there are `\\input' commands with relative directories.") -(custom-autoload (quote tex-directory) "tex-mode") +(custom-autoload (quote tex-directory) "tex-mode" t) (defvar tex-first-line-header-regexp nil "\ Regexp for matching a first line which `tex-region' should include. @@ -26544,40 +26601,40 @@ If this is non-nil, it should be a regular expression string; if it matches the first line of the file, `tex-region' always includes the first line in the TeX run.") -(custom-autoload (quote tex-first-line-header-regexp) "tex-mode") +(custom-autoload (quote tex-first-line-header-regexp) "tex-mode" t) (defvar tex-main-file nil "\ *The main TeX source file which includes this buffer's file. The command `tex-file' runs TeX on the file specified by `tex-main-file' if the variable is non-nil.") -(custom-autoload (quote tex-main-file) "tex-mode") +(custom-autoload (quote tex-main-file) "tex-mode" t) (defvar tex-offer-save t "\ *If non-nil, ask about saving modified buffers before \\[tex-file] is run.") -(custom-autoload (quote tex-offer-save) "tex-mode") +(custom-autoload (quote tex-offer-save) "tex-mode" t) (defvar tex-run-command "tex" "\ *Command used to run TeX subjob. TeX Mode sets `tex-command' to this string. See the documentation of that variable.") -(custom-autoload (quote tex-run-command) "tex-mode") +(custom-autoload (quote tex-run-command) "tex-mode" t) (defvar latex-run-command "latex" "\ *Command used to run LaTeX subjob. LaTeX Mode sets `tex-command' to this string. See the documentation of that variable.") -(custom-autoload (quote latex-run-command) "tex-mode") +(custom-autoload (quote latex-run-command) "tex-mode" t) (defvar slitex-run-command "slitex" "\ *Command used to run SliTeX subjob. SliTeX Mode sets `tex-command' to this string. See the documentation of that variable.") -(custom-autoload (quote slitex-run-command) "tex-mode") +(custom-autoload (quote slitex-run-command) "tex-mode" t) (defvar tex-start-options "" "\ *TeX options to use when starting TeX. @@ -26585,34 +26642,34 @@ These immediately precede the commands in `tex-start-commands' and the input file name, with no separating space and are not shell-quoted. If nil, TeX runs with no options. See the documentation of `tex-command'.") -(custom-autoload (quote tex-start-options) "tex-mode") +(custom-autoload (quote tex-start-options) "tex-mode" t) (defvar tex-start-commands "\\nonstopmode\\input" "\ *TeX commands to use when starting TeX. They are shell-quoted and precede the input file name, with a separating space. If nil, no commands are used. See the documentation of `tex-command'.") -(custom-autoload (quote tex-start-commands) "tex-mode") +(custom-autoload (quote tex-start-commands) "tex-mode" t) (defvar latex-block-names nil "\ *User defined LaTeX block names. Combined with `latex-standard-block-names' for minibuffer completion.") -(custom-autoload (quote latex-block-names) "tex-mode") +(custom-autoload (quote latex-block-names) "tex-mode" t) (defvar tex-bibtex-command "bibtex" "\ *Command used by `tex-bibtex-file' to gather bibliographic data. If this string contains an asterisk (`*'), that is replaced by the file name; otherwise, the file name, preceded by blank, is added at the end.") -(custom-autoload (quote tex-bibtex-command) "tex-mode") +(custom-autoload (quote tex-bibtex-command) "tex-mode" t) (defvar tex-dvi-print-command "lpr -d" "\ *Command used by \\[tex-print] to print a .dvi file. If this string contains an asterisk (`*'), that is replaced by the file name; otherwise, the file name, preceded by blank, is added at the end.") -(custom-autoload (quote tex-dvi-print-command) "tex-mode") +(custom-autoload (quote tex-dvi-print-command) "tex-mode" t) (defvar tex-alt-dvi-print-command "lpr -d" "\ *Command used by \\[tex-print] with a prefix arg to print a .dvi file. @@ -26629,7 +26686,7 @@ for example, would tell \\[tex-print] with a prefix argument to ask you which printer to use.") -(custom-autoload (quote tex-alt-dvi-print-command) "tex-mode") +(custom-autoload (quote tex-alt-dvi-print-command) "tex-mode" t) (defvar tex-dvi-view-command (quote (cond ((eq window-system (quote x)) "xdvi") ((eq window-system (quote w32)) "yap") (t "dvi2tty * | cat -s"))) "\ *Command used by \\[tex-view] to display a `.dvi' file. @@ -26639,13 +26696,13 @@ otherwise, the file name, preceded by a space, is added at the end. If the value is a form, it is evaluated to get the command to use.") -(custom-autoload (quote tex-dvi-view-command) "tex-mode") +(custom-autoload (quote tex-dvi-view-command) "tex-mode" t) (defvar tex-show-queue-command "lpq" "\ *Command used by \\[tex-show-print-queue] to show the print queue. Should show the queue(s) that \\[tex-print] puts jobs on.") -(custom-autoload (quote tex-show-queue-command) "tex-mode") +(custom-autoload (quote tex-show-queue-command) "tex-mode" t) (defvar tex-default-mode (quote latex-mode) "\ *Mode to enter for a new file that might be either TeX or LaTeX. @@ -26653,17 +26710,17 @@ This variable is used when it can't be determined whether the file is plain TeX or LaTeX or what because the file contains no commands. Normally set to either `plain-tex-mode' or `latex-mode'.") -(custom-autoload (quote tex-default-mode) "tex-mode") +(custom-autoload (quote tex-default-mode) "tex-mode" t) (defvar tex-open-quote "``" "\ *String inserted by typing \\[tex-insert-quote] to open a quotation.") -(custom-autoload (quote tex-open-quote) "tex-mode") +(custom-autoload (quote tex-open-quote) "tex-mode" t) (defvar tex-close-quote "''" "\ *String inserted by typing \\[tex-insert-quote] to close a quotation.") -(custom-autoload (quote tex-close-quote) "tex-mode") +(custom-autoload (quote tex-close-quote) "tex-mode" t) (autoload (quote tex-mode) "tex-mode" "\ Major mode for editing files of input for TeX, LaTeX, or SliTeX. @@ -26951,7 +27008,7 @@ value of `texinfo-mode-hook'. ;;;### (autoloads (thai-auto-composition-mode thai-composition-function ;;;;;; thai-post-read-conversion thai-compose-buffer thai-compose-string ;;;;;; thai-compose-region) "thai-util" "language/thai-util.el" -;;;;;; (17279 27123)) +;;;;;; (17817 15478)) ;;; Generated autoloads from language/thai-util.el (autoload (quote thai-compose-region) "thai-util" "\ @@ -26995,7 +27052,7 @@ Minor mode for automatically correct Thai character composition. ;;;### (autoloads (list-at-point number-at-point symbol-at-point ;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) -;;;;;; "thingatpt" "thingatpt.el" (17778 50479)) +;;;;;; "thingatpt" "thingatpt.el" (17817 13977)) ;;; Generated autoloads from thingatpt.el (autoload (quote forward-thing) "thingatpt" "\ @@ -27091,7 +27148,7 @@ In dired, call the setroot program on the image at point. ;;;;;; tibetan-composition-function tibetan-decompose-string tibetan-decompose-region ;;;;;; tibetan-compose-region tibetan-compose-string tibetan-transcription-to-tibetan ;;;;;; tibetan-tibetan-to-transcription tibetan-char-p) "tibet-util" -;;;;;; "language/tibet-util.el" (17279 27080)) +;;;;;; "language/tibet-util.el" (17817 15478)) ;;; Generated autoloads from language/tibet-util.el (autoload (quote tibetan-char-p) "tibet-util" "\ @@ -27170,7 +27227,7 @@ Not documented ;;;*** ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el" -;;;;;; (17390 26946)) +;;;;;; (17817 14129)) ;;; Generated autoloads from textmodes/tildify.el (autoload (quote tildify-region) "tildify" "\ @@ -27467,7 +27524,7 @@ relative only to the time worked today, and not to past time. ;;;### (autoloads (with-timeout run-with-idle-timer add-timeout run-with-timer ;;;;;; run-at-time cancel-function-timers cancel-timer) "timer" -;;;;;; "emacs-lisp/timer.el" (17713 5989)) +;;;;;; "emacs-lisp/timer.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/timer.el (defalias (quote disable-timeout) (quote cancel-timer)) @@ -27543,7 +27600,7 @@ be detected. ;;;*** ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv" -;;;;;; "international/titdic-cnv.el" (17279 27079)) +;;;;;; "international/titdic-cnv.el" (17817 15478)) ;;; Generated autoloads from international/titdic-cnv.el (autoload (quote titdic-convert) "titdic-cnv" "\ @@ -27566,8 +27623,8 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** ;;;### (autoloads (tamil-composition-function tamil-post-read-conversion -;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17279 -;;;;;; 27080)) +;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17817 +;;;;;; 14146)) ;;; Generated autoloads from language/tml-util.el (autoload (quote tamil-compose-region) "tml-util" "\ @@ -27764,7 +27821,7 @@ holds a keymap. ;;;*** ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el" -;;;;;; (17778 50473)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emulation/tpu-edt.el (defvar tpu-edt-mode nil "\ @@ -27791,7 +27848,7 @@ Turn on TPU/edt emulation. ;;;*** ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins) -;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17390 26938)) +;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17817 13982)) ;;; Generated autoloads from emulation/tpu-extras.el (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\ @@ -27811,7 +27868,7 @@ Constrain the cursor to the flow of the text. ;;;*** -;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17713 5733)) +;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload (quote tq-create) "tq" "\ @@ -27825,7 +27882,7 @@ to a tcp server on another machine. ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (17713 5989)) +;;;;;; "trace" "emacs-lisp/trace.el" (17817 13982)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -27862,7 +27919,7 @@ BUFFER defaults to `trace-buffer'. ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-completion-file-name-regexp -;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17778 50475)) +;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17817 16949)) ;;; Generated autoloads from net/tramp.el (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\ @@ -27965,7 +28022,7 @@ Like `file-name-all-completions' for partial tramp files. (autoload (quote tramp-completion-handle-file-name-completion) "tramp" "\ Like `file-name-completion' for tramp files. -\(fn FILENAME DIRECTORY)" nil nil) +\(fn FILENAME DIRECTORY &optional PREDICATE)" nil nil) (autoload (quote tramp-unload-tramp) "tramp" "\ Discard Tramp from loading remote files. @@ -28121,8 +28178,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17778 -;;;;;; 50471)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17817 +;;;;;; 16152)) ;;; Generated autoloads from tutorial.el (autoload (quote help-with-tutorial) "tutorial" "\ @@ -28147,7 +28204,7 @@ resumed later. ;;;*** ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" -;;;;;; "textmodes/two-column.el" (17713 5993)) +;;;;;; "textmodes/two-column.el" (17817 14129)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28198,7 +28255,7 @@ First column's text sSs Second column's text ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (17390 26947)) +;;;;;; (17817 13977)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28207,12 +28264,12 @@ See the docstring for the `type-break-mode' command for more information. Setting this variable directly does not take effect; use either \\[customize] or the function `type-break-mode'.") -(custom-autoload (quote type-break-mode) "type-break") +(custom-autoload (quote type-break-mode) "type-break" nil) (defvar type-break-interval (* 60 60) "\ *Number of seconds between scheduled typing breaks.") -(custom-autoload (quote type-break-interval) "type-break") +(custom-autoload (quote type-break-interval) "type-break" t) (defvar type-break-good-rest-interval (/ type-break-interval 6) "\ *Number of seconds of idle time considered to be an adequate typing rest. @@ -28224,7 +28281,7 @@ rest from typing, then the next typing break is simply rescheduled for later. If a break is interrupted before this much time elapses, the user will be asked whether or not really to interrupt the break.") -(custom-autoload (quote type-break-good-rest-interval) "type-break") +(custom-autoload (quote type-break-good-rest-interval) "type-break" t) (defvar type-break-good-break-interval nil "\ *Number of seconds considered to be an adequate explicit typing rest. @@ -28234,7 +28291,7 @@ length (in seconds) for a break initiated by the command `type-break', overriding `type-break-good-rest-interval'. This provides querying of break interruptions when `type-break-good-rest-interval' is nil.") -(custom-autoload (quote type-break-good-break-interval) "type-break") +(custom-autoload (quote type-break-good-break-interval) "type-break" t) (defvar type-break-keystroke-threshold (let* ((wpm 35) (avg-word-length 5) (upper (* wpm avg-word-length (/ type-break-interval 60))) (lower (/ upper 5))) (cons lower upper)) "\ *Upper and lower bound on number of keystrokes for considering typing break. @@ -28258,7 +28315,7 @@ keystroke even though they really require multiple keys to generate them. The command `type-break-guesstimate-keystroke-threshold' can be used to guess a reasonably good pair of values for this variable.") -(custom-autoload (quote type-break-keystroke-threshold) "type-break") +(custom-autoload (quote type-break-keystroke-threshold) "type-break" t) (autoload (quote type-break-mode) "type-break" "\ Enable or disable typing-break mode. @@ -28381,7 +28438,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** ;;;### (autoloads (ununderline-region underline-region) "underline" -;;;;;; "textmodes/underline.el" (17390 26946)) +;;;;;; "textmodes/underline.el" (17817 14129)) ;;; Generated autoloads from textmodes/underline.el (autoload (quote underline-region) "underline" "\ @@ -28402,7 +28459,7 @@ which specify the range to operate on. ;;;*** ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message) -;;;;;; "undigest" "mail/undigest.el" (17390 26943)) +;;;;;; "undigest" "mail/undigest.el" (17817 14120)) ;;; Generated autoloads from mail/undigest.el (autoload (quote undigestify-rmail-message) "undigest" "\ @@ -28421,7 +28478,7 @@ following the containing message. ;;;*** ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el" -;;;;;; (17390 26943)) +;;;;;; (17817 14120)) ;;; Generated autoloads from mail/unrmail.el (autoload (quote batch-unrmail) "unrmail" "\ @@ -28454,7 +28511,7 @@ of symbols with local bindings. ;;;*** ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url" -;;;;;; "url/url.el" (17778 50479)) +;;;;;; "url/url.el" (17817 13984)) ;;; Generated autoloads from url/url.el (autoload (quote url-retrieve) "url" "\ @@ -28600,7 +28657,7 @@ Handle file: and ftp: URLs. ;;;*** ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw" -;;;;;; "url/url-gw.el" (17778 50299)) +;;;;;; "url/url-gw.el" (17817 14148)) ;;; Generated autoloads from url/url-gw.el (autoload (quote url-gateway-nslookup-host) "url-gw" "\ @@ -28664,7 +28721,7 @@ Not documented ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (17778 50479)) +;;;;;; url-http) "url-http" "url/url-http.el" (17817 13984)) ;;; Generated autoloads from url/url-http.el (autoload (quote url-http) "url-http" "\ @@ -29023,7 +29080,7 @@ This uses `url-current-object', set locally to the buffer. ;;;*** ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock) -;;;;;; "userlock" "userlock.el" (17778 50479)) +;;;;;; "userlock" "userlock.el" (17817 13977)) ;;; Generated autoloads from userlock.el (autoload (quote ask-user-about-lock) "userlock" "\ @@ -29051,7 +29108,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (17279 27196)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (17817 14143)) ;;; Generated autoloads from international/utf-7.el (autoload-coding-system 'utf-7 '(require 'utf-7)) @@ -29377,7 +29434,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** -;;;### (autoloads nil "vc-arch" "vc-arch.el" (17390 26947)) +;;;### (autoloads nil "vc-arch" "vc-arch.el" (17817 16875)) ;;; Generated autoloads from vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29456,7 +29513,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (17778 50476)) +;;;;;; (17817 13977)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload (quote vhdl-mode) "vhdl-mode" "\ @@ -29997,7 +30054,7 @@ Key bindings: ;;;*** -;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17279 27079)) +;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17817 14136)) ;;; Generated autoloads from emulation/vi.el (autoload (quote vi-mode) "vi" "\ @@ -30052,7 +30109,7 @@ Syntax table and abbrevs while in vi mode remain as they were in Emacs. ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion ;;;;;; viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer ;;;;;; viet-decode-viqr-region viet-encode-viscii-char) "viet-util" -;;;;;; "language/viet-util.el" (17279 27080)) +;;;;;; "language/viet-util.el" (17817 15478)) ;;; Generated autoloads from language/viet-util.el (autoload (quote viet-encode-viscii-char) "viet-util" "\ @@ -30308,8 +30365,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17778 -;;;;;; 50473)) +;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17817 +;;;;;; 13982)) ;;; Generated autoloads from emulation/vip.el (autoload (quote vip-setup) "vip" "\ @@ -30431,7 +30488,7 @@ this is equivalent to `display-warning', using ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (17713 1026)) +;;;;;; (17817 14148)) ;;; Generated autoloads from wdired.el (autoload (quote wdired-change-to-wdired-mode) "wdired" "\ @@ -30447,7 +30504,7 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17390 26944)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17817 14122)) ;;; Generated autoloads from net/webjump.el (autoload (quote webjump) "webjump" "\ @@ -30496,7 +30553,7 @@ and off otherwise. ;;;;;; whitespace-buffer whitespace-toggle-ateol-check whitespace-toggle-spacetab-check ;;;;;; whitespace-toggle-indent-check whitespace-toggle-trailing-check ;;;;;; whitespace-toggle-leading-check) "whitespace" "whitespace.el" -;;;;;; (17778 50479)) +;;;;;; (17817 13977)) ;;; Generated autoloads from whitespace.el (autoload (quote whitespace-toggle-leading-check) "whitespace" "\ @@ -30587,7 +30644,7 @@ This is meant to be added buffer-locally to `write-file-functions'. ;;;*** ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse -;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17390 26950)) +;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17817 13977)) ;;; Generated autoloads from wid-browse.el (autoload (quote widget-browse-at) "wid-browse" "\ @@ -30659,8 +30716,8 @@ Setup current buffer so editing string widgets works. ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17390 -;;;;;; 26950)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17817 +;;;;;; 13977)) ;;; Generated autoloads from windmove.el (autoload (quote windmove-left) "windmove" "\ @@ -30732,7 +30789,7 @@ With arg, turn Winner mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman" -;;;;;; "woman.el" (17778 48451)) +;;;;;; "woman.el" (17817 16161)) ;;; Generated autoloads from woman.el (autoload (quote woman) "woman" "\ @@ -30768,7 +30825,7 @@ decompress the file if appropriate. See the documentation for the ;;;*** ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el" -;;;;;; (17390 26938)) +;;;;;; (17817 13982)) ;;; Generated autoloads from emulation/ws-mode.el (autoload (quote wordstar-mode) "ws-mode" "\ @@ -30952,7 +31009,7 @@ Extract file name from an yenc header. ;;;*** ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism -;;;;;; yow) "yow" "play/yow.el" (17383 38807)) +;;;;;; yow) "yow" "play/yow.el" (17817 14126)) ;;; Generated autoloads from play/yow.el (autoload (quote yow) "yow" "\ @@ -31093,14 +31150,9 @@ Zone out, completely. ;;;;;; "net/eudcb-bbdb.el" "net/eudcb-ldap.el" "net/eudcb-mab.el" ;;;;;; "net/eudcb-ph.el" "net/ldap.el" "net/netrc.el" "net/tls.el" ;;;;;; "net/tramp-smb.el" "net/tramp-util.el" "net/tramp-uu.el" -;;;;;; "net/tramp-vc.el" "net/trampver.el" "obsolete/awk-mode.el" -;;;;;; "obsolete/bg-mouse.el" "obsolete/float.el" "obsolete/hilit19.el" -;;;;;; "obsolete/iso-insert.el" "obsolete/iso-swed.el" "obsolete/keyswap.el" -;;;;;; "obsolete/mlsupport.el" "obsolete/ooutline.el" "obsolete/profile.el" -;;;;;; "obsolete/rnews.el" "obsolete/sc.el" "obsolete/sun-curs.el" -;;;;;; "obsolete/sun-fns.el" "obsolete/swedish.el" "obsolete/uncompress.el" -;;;;;; "obsolete/x-apollo.el" "obsolete/x-menu.el" "patcomp.el" -;;;;;; "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el" +;;;;;; "net/tramp-vc.el" "net/trampver.el" "obsolete/bg-mouse.el" +;;;;;; "obsolete/hilit19.el" "obsolete/sc.el" "obsolete/uncompress.el" +;;;;;; "patcomp.el" "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el" ;;;;;; "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" ;;;;;; "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el" ;;;;;; "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" @@ -31112,26 +31164,24 @@ Zone out, completely. ;;;;;; "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" "progmodes/xscheme.el" ;;;;;; "register.el" "replace.el" "rfn-eshadow.el" "s-region.el" ;;;;;; "saveplace.el" "sb-image.el" "scroll-bar.el" "select.el" -;;;;;; "soundex.el" "startup.el" "subdirs.el" "tempo.el" "term/AT386.el" -;;;;;; "term/apollo.el" "term/bobcat.el" "term/cygwin.el" "term/internal.el" -;;;;;; "term/iris-ansi.el" "term/linux.el" "term/lk201.el" "term/mac-win.el" -;;;;;; "term/news.el" "term/pc-win.el" "term/rxvt.el" "term/sun-mouse.el" -;;;;;; "term/sun.el" "term/sup-mouse.el" "term/tty-colors.el" "term/tvi970.el" -;;;;;; "term/vt100.el" "term/vt102.el" "term/vt125.el" "term/vt200.el" +;;;;;; "soundex.el" "startup.el" "subdirs.el" "tempo.el" "term/apollo.el" +;;;;;; "term/bobcat.el" "term/cygwin.el" "term/internal.el" "term/linux.el" +;;;;;; "term/lk201.el" "term/pc-win.el" "term/rxvt.el" "term/sun.el" +;;;;;; "term/tty-colors.el" "term/vt102.el" "term/vt125.el" "term/vt200.el" ;;;;;; "term/vt201.el" "term/vt220.el" "term/vt240.el" "term/vt300.el" -;;;;;; "term/vt320.el" "term/vt400.el" "term/vt420.el" "term/w32-win.el" -;;;;;; "term/wyse50.el" "termdev.el" "textmodes/bib-mode.el" "textmodes/makeinfo.el" -;;;;;; "textmodes/page-ext.el" "textmodes/page.el" "textmodes/refbib.el" -;;;;;; "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" -;;;;;; "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" -;;;;;; "textmodes/texnfo-upd.el" "textmodes/text-mode.el" "timezone.el" -;;;;;; "tooltip.el" "tree-widget.el" "uniquify.el" "url/url-about.el" -;;;;;; "url/url-cookie.el" "url/url-dired.el" "url/url-expand.el" -;;;;;; "url/url-ftp.el" "url/url-history.el" "url/url-imap.el" "url/url-methods.el" -;;;;;; "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "url/vc-dav.el" -;;;;;; "vc-hooks.el" "vcursor.el" "version.el" "vms-patch.el" "vmsproc.el" -;;;;;; "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el" -;;;;;; "widget.el" "window.el" "x-dnd.el") (17778 59104 269580)) +;;;;;; "term/vt320.el" "term/vt400.el" "term/vt420.el" "termdev.el" +;;;;;; "textmodes/bib-mode.el" "textmodes/makeinfo.el" "textmodes/page-ext.el" +;;;;;; "textmodes/page.el" "textmodes/refbib.el" "textmodes/refer.el" +;;;;;; "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el" +;;;;;; "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el" +;;;;;; "textmodes/text-mode.el" "timezone.el" "tooltip.el" "tree-widget.el" +;;;;;; "uniquify.el" "url/url-about.el" "url/url-cookie.el" "url/url-dired.el" +;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" +;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" +;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el" +;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el" +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el" +;;;;;; "x-dnd.el") (17817 17746 543314)) ;;;*** diff --git a/lisp/ledit.el b/lisp/ledit.el index e44be052d82..9cfbf5334a4 100644 --- a/lisp/ledit.el +++ b/lisp/ledit.el @@ -1,6 +1,6 @@ ;;; ledit.el --- Emacs side of ledit interface -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 6683f8ae413..4c80619fbdc 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -1,6 +1,6 @@ ;;; loadhist.el --- lisp functions for working with feature groups -;; Copyright (C) 1995, 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/log-edit.el b/lisp/log-edit.el index 611bab0a247..3fd877ac4b2 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el @@ -1,6 +1,6 @@ ;;; log-edit.el --- Major mode for editing CVS commit messages -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 3a18442ef13..7114fc61660 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -1,6 +1,6 @@ ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp -;; Copyright (C) 1992, 1994, 2000, 2002, 2003, 2004, +;; Copyright (C) 1992, 1994, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> diff --git a/lisp/macros.el b/lisp/macros.el index db4de40e745..ea71bd0da20 100644 --- a/lisp/macros.el +++ b/lisp/macros.el @@ -1,6 +1,6 @@ ;;; macros.el --- non-primitive commands for keyboard macros -;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2002, 2003, +;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el index 41bad17d70e..321dc13cebc 100644 --- a/lisp/mail/blessmail.el +++ b/lisp/mail/blessmail.el @@ -1,6 +1,6 @@ ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*- -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index e831b89ef84..b2374490026 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -1,6 +1,6 @@ ;;; footnote.el --- footnote support for message mode -*- coding: iso-latin-1;-*- -;; Copyright (C) 1997, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L Baur <steve@xemacs.org> @@ -501,7 +501,8 @@ styles." (regexp-quote footnote-end-tag))) nil t) (unless (beginning-of-line) t)) - (goto-char (point-max))))) + (Footnote-goto-char-point-max) + (re-search-backward (concat "^" footnote-section-tag-regexp) nil t)))) (unless (looking-at "^$") (insert "\n")) (when (eobp) diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el index a2d7b0aab0f..c718110e9ec 100644 --- a/lisp/mail/mail-hist.el +++ b/lisp/mail/mail-hist.el @@ -1,6 +1,6 @@ ;;; mail-hist.el --- headers and message body history for outgoing mail -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com> diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index eab55bdef25..1e32b2d02df 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -1,7 +1,7 @@ ;;; mailabbrev.el --- abbrev-expansion of mail aliases -;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2002, -;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2001, +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com>, now <jwz@jwz.org> ;; Maintainer: FSF diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 7d60ed27e5c..d22507c7722 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -1,6 +1,6 @@ ;;; mailalias.el --- expand and complete mailing address aliases -;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2002, 2003, +;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el index 377144f7d68..4b6579fb6cb 100644 --- a/lisp/mail/mailheader.el +++ b/lisp/mail/mailheader.el @@ -1,6 +1,6 @@ ;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no> diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el index 2388ab87971..4c6ef4bf928 100644 --- a/lisp/mail/metamail.el +++ b/lisp/mail/metamail.el @@ -1,6 +1,6 @@ ;;; metamail.el --- Metamail interface for GNU Emacs -;; Copyright (C) 1993, 1996, 2002, 2003, 2004, +;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp> diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el index a2f460d13a0..9084982b304 100644 --- a/lisp/mail/mspools.el +++ b/lisp/mail/mspools.el @@ -1,6 +1,6 @@ ;;; mspools.el --- show mail spools waiting to be read -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Stephen Eglen <stephen@gnu.org> diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el index fa6c1c5e307..35c1381d891 100644 --- a/lisp/mail/reporter.el +++ b/lisp/mail/reporter.el @@ -1,7 +1,7 @@ ;;; reporter.el --- customizable bug reporting of lisp programs -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: 1993-1998 Barry A. Warsaw ;; Maintainer: FSF diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el index ef20ac0398d..f03e9a635f0 100644 --- a/lisp/mail/rfc2368.el +++ b/lisp/mail/rfc2368.el @@ -1,11 +1,11 @@ ;;; rfc2368.el --- support for rfc2368 +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. + ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: mail -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el index 97a47f56f99..67ff1e02e89 100644 --- a/lisp/mail/rfc822.el +++ b/lisp/mail/rfc822.el @@ -1,6 +1,6 @@ ;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike -;; Copyright (C) 1986, 1987, 1990, 2002, 2003, 2004, +;; Copyright (C) 1986, 1987, 1990, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el index 3502c0a7c57..f7d0885a3ac 100644 --- a/lisp/mail/rmailmsc.el +++ b/lisp/mail/rmailmsc.el @@ -1,6 +1,6 @@ ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el index cdb917701f7..f7beef054b0 100644 --- a/lisp/mail/supercite.el +++ b/lisp/mail/supercite.el @@ -1,6 +1,6 @@ ;;; supercite.el --- minor mode for citing mail and news replies -;; Copyright (C) 1993, 1997, 2002, 2003, 2004, +;; Copyright (C) 1993, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org> diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el index 4d48f467b59..ff53e06014e 100644 --- a/lisp/mail/uce.el +++ b/lisp/mail/uce.el @@ -1,6 +1,6 @@ ;;; uce.el --- facilitate reply to unsolicited commercial email -;; Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: stanislav shalunov <shalunov@mccme.ru> diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el index 210a1d254f3..fce4e781ff8 100644 --- a/lisp/mail/undigest.el +++ b/lisp/mail/undigest.el @@ -1,6 +1,6 @@ ;;; undigest.el --- digest-cracking support for the RMAIL mail reader -;; Copyright (C) 1985, 1986, 1994, 1996, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1994, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el index cf12472fb0e..79788ff1dc0 100644 --- a/lisp/mail/unrmail.el +++ b/lisp/mail/unrmail.el @@ -1,6 +1,6 @@ ;;; unrmail.el --- convert Rmail files to mailbox files -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el index e7c44edbeb2..3a801565315 100644 --- a/lisp/mail/vms-pmail.el +++ b/lisp/mail/vms-pmail.el @@ -1,6 +1,6 @@ ;;; vms-pmail.el --- use Emacs as the editor within VMS mail -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Roland B Roberts <roberts@panix.com> diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 8acdde52670..bbae20fd446 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -371,7 +371,12 @@ pre-mh-loaddefs.el-CMD: # sources only. # Need separate version for sh and native cmd.exe -bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el +# Note that bootstrap-clean-$(SHELLTYPE) copies ldefs-boot.el to loaddefs.el, +# and thus the almost-empty loaddefs.el crafted by the $(lisp)/loaddefs.el +# target can NOT be built _after_ bootstrap-clean-$(SHELLTYPE) does its +# thing, or else an empty loaddefs.el will overwrite the full one. +bootstrap-clean: $(lisp)/loaddefs.el + $(MAKE) $(MFLAGS) bootstrap-clean-$(SHELLTYPE) bootstrap-clean-CMD: # if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads diff --git a/lisp/makesum.el b/lisp/makesum.el index 3e43d75191b..f34906f04f0 100644 --- a/lisp/makesum.el +++ b/lisp/makesum.el @@ -1,6 +1,6 @@ ;;; makesum.el --- generate key binding summary for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/man.el b/lisp/man.el index 2351853eeca..40a4e810204 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -428,13 +428,17 @@ Otherwise, the value is whatever the function 'follow-link t 'help-echo "mouse-2, RET: display this man page" 'func nil - 'action (lambda (button) - (funcall - (button-get button 'func) - (let ((func (button-get button 'Man-target-string))) - (if func - (if (functionp func) (funcall func) func) - (button-label button)))))) + 'action #'Man-xref-button-action) + +(defun Man-xref-button-action (button) + (let ((target (button-get button 'Man-target-string))) + (funcall + (button-get button 'func) + (cond ((null target) + (button-label button)) + ((functionp target) + (funcall target (button-start button))) + (t target))))) (define-button-type 'Man-xref-man-page :supertype 'Man-abstract-xref-man-page @@ -636,11 +640,12 @@ a new value." ;; ====================================================================== ;; default man entry: get word under point -(defsubst Man-default-man-entry () - "Make a guess at a default manual entry. -This guess is based on the text surrounding the cursor." +(defsubst Man-default-man-entry (&optional pos) + "Make a guess at a default manual entry based on the text at POS. +If POS is nil, the current point is used." (let (word) (save-excursion + (if pos (goto-char pos)) ;; Default man entry title is any word the cursor is on, or if ;; cursor not on a word, then nearest preceding word. (skip-chars-backward "-a-zA-Z0-9._+:") diff --git a/lisp/master.el b/lisp/master.el index adf3e92dcbe..186d67e81a3 100644 --- a/lisp/master.el +++ b/lisp/master.el @@ -1,6 +1,7 @@ ;;; master.el --- make a buffer the master over another buffer -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Alexander Schroeder +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Alex Schroeder <alex@gnu.org> diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index fb59ef9f90e..9f98e3a2122 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -462,9 +462,10 @@ A large number or nil slows down menu responsiveness." "Delete the text in region between mark and current position")) (defvar yank-menu (cons "Select Yank" nil)) (fset 'yank-menu (cons 'keymap yank-menu)) -(define-key menu-bar-edit-menu [select-paste] - '(menu-item "Select and Paste" yank-menu - :enable (and (cdr yank-menu) (not buffer-read-only)))) +(define-key menu-bar-edit-menu [paste-from-menu] + '(menu-item "Paste from kill menu" yank-menu + :enable (and (cdr yank-menu) (not buffer-read-only)) + :help "Choose a string from the kill ring and paste it")) (define-key menu-bar-edit-menu [paste] '(menu-item "Paste" yank :enable (and @@ -623,8 +624,8 @@ by \"Save Options\" in Custom buffers.") (let ((set (or (get ',variable 'custom-set) 'set-default)) (get (or (get ',variable 'custom-get) 'default-value))) (funcall set ',variable (not (funcall get ',variable)))))) - (message ,message "enabled") - (message ,message "disabled")) + (message ,message "enabled globally") + (message ,message "disabled globally")) ;; The function `customize-mark-as-set' must only be called when ;; a variable is set interactively, as the purpose is to mark it as ;; a candidate for "Save Options", and we do not want to save options @@ -814,7 +815,7 @@ mail status in mode line")) (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines "Empty Line Indicators" "Indicating of empty lines %s" - "Indicate trailing empty lines in fringe")) + "Indicate trailing empty lines in fringe, globally")) (defun menu-bar-showhide-fringe-menu-customize () "Show customization buffer for `fringe-mode'." @@ -923,13 +924,13 @@ mail status in mode line")) (define-key menu-bar-showhide-menu [showhide-tooltip-mode] (list 'menu-item "Tooltips" 'tooltip-mode - :help "Toggle tooltips on/off" + :help "Turn tooltips on/off" :visible `(and (display-graphic-p) (fboundp 'x-show-tip)) :button `(:toggle . tooltip-mode))) (define-key menu-bar-showhide-menu [menu-bar-mode] '(menu-item "Menu-bar" toggle-menu-bar-mode-from-frame - :help "Toggle menu-bar on/off" + :help "Turn menu-bar on/off" :button (:toggle . (> (frame-parameter nil 'menu-bar-lines) 0)))) (define-key menu-bar-showhide-menu [showhide-tool-bar] @@ -1019,8 +1020,8 @@ mail status in mode line")) (define-key menu-bar-options-menu [case-fold-search] (menu-bar-make-toggle toggle-case-fold-search case-fold-search "Case-Insensitive Search" - "Case-Insensitive Search %s for buffers without local setting" - "Ignore letter-case in search for buffers without local setting")) + "Case-Insensitive Search %s" + "Globally ignore letter-case in search")) (defun menu-bar-text-mode-auto-fill () (interactive) @@ -1126,7 +1127,8 @@ mail status in mode line")) '(menu-item "Programmable Calculator" calc :help "Invoke the Emacs built-in full scientific calculator")) (define-key menu-bar-tools-menu [calendar] - '(menu-item "Calendar" calendar)) + '(menu-item "Calendar" calendar + :help "Invoke the Emacs built-in calendar")) (define-key menu-bar-tools-menu [separator-net] '("--")) @@ -1385,12 +1387,14 @@ key, a click, or a menu-item")) '(menu-item "Send Bug Report..." report-emacs-bug :help "Send e-mail to Emacs maintainers")) (define-key menu-bar-help-menu [emacs-problems] - '(menu-item "Emacs Known Problems" view-emacs-problems)) + '(menu-item "Emacs Known Problems" view-emacs-problems + :help "Read about known problems with Emacs")) (define-key menu-bar-help-menu [emacs-news] '(menu-item "Emacs News" view-emacs-news :help "New features of this version")) (define-key menu-bar-help-menu [emacs-faq] - '(menu-item "Emacs FAQ" view-emacs-FAQ)) + '(menu-item "Emacs FAQ" view-emacs-FAQ + :help "Frequently asked (and answered) questions about Emacs")) (defun help-with-tutorial-spec-language () "Use the Emacs tutorial, specifying which language you want." diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 1093fdbcdb5..96bb50eec69 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -2868,7 +2868,7 @@ * ChangeLog.1: New file. Contains old ChangeLog. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 66b510011a1..40b69964ec3 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -11407,7 +11407,7 @@ (dist): Leave release in current directory. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/lisp/midnight.el b/lisp/midnight.el index d97eb83b543..d7cdb1f655d 100644 --- a/lisp/midnight.el +++ b/lisp/midnight.el @@ -1,6 +1,6 @@ ;;; midnight.el --- run something every midnight, e.g., kill old buffers -;; Copyright (C) 1998, 2002, 2003, 2004, 2005, +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Sam Steingold <sds@usa.net> diff --git a/lisp/misc.el b/lisp/misc.el index 522ffef9cb7..76e5842e20c 100644 --- a/lisp/misc.el +++ b/lisp/misc.el @@ -1,6 +1,6 @@ ;;; misc.el --- some nonstandard basic editing commands for Emacs -;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el index 7703f62f336..216cc5360d6 100644 --- a/lisp/mouse-copy.el +++ b/lisp/mouse-copy.el @@ -1,6 +1,6 @@ ;;; mouse-copy.el --- one-click text copy and move -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: John Heidemann <johnh@ISI.EDU> diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el index a1209f827f1..5c3e79ed807 100644 --- a/lisp/mouse-sel.el +++ b/lisp/mouse-sel.el @@ -244,6 +244,10 @@ primary selection and region." :group 'mouse-sel (if mouse-sel-mode (progn + ;; If mouse-2 has never been done by the user, initialize the + ;; `event-kind' property to ensure that `follow-link' clicks + ;; are interpreted correctly. + (put 'mouse-2 'event-kind 'mouse-click) (add-hook 'x-lost-selection-functions 'mouse-sel-lost-selection-hook) (when mouse-sel-default-bindings ;; Save original bindings and replace them with new ones. diff --git a/lisp/mouse.el b/lisp/mouse.el index 23a2cab4740..b60552f1183 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -925,7 +925,11 @@ should only be used by mouse-drag-region." (click-count (1- (event-click-count start-event))) (remap-double-click (and on-link (eq mouse-1-click-follows-link 'double) - (= click-count 1)))) + (= click-count 1))) + ;; Suppress automatic hscrolling, because that is a nuisance + ;; when setting point near the right fringe (but see below). + (automatic-hscrolling-saved automatic-hscrolling) + (automatic-hscrolling nil)) (setq mouse-selection-click-count click-count) ;; In case the down click is in the middle of some intangible text, ;; use the end of that text, and put it in START-POINT. @@ -946,6 +950,11 @@ should only be used by mouse-drag-region." (memq (car-safe event) '(switch-frame select-window)))) (if (memq (car-safe event) '(switch-frame select-window)) nil + ;; Automatic hscrolling did not occur during the call to + ;; `read-event'; but if the user subsequently drags the + ;; mouse, go ahead and hscroll. + (let ((automatic-hscrolling automatic-hscrolling-saved)) + (redisplay)) (setq end (event-end event) end-point (posn-point end)) (if (numberp end-point) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index c77dbbd64b3..75c9b04a040 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3977,7 +3977,7 @@ E.g., ange-ftp-this-dir)) (ange-ftp-real-file-name-all-completions file ange-ftp-this-dir))))) -(defun ange-ftp-file-name-completion (file dir) +(defun ange-ftp-file-name-completion (file dir &optional predicate) (let ((ange-ftp-this-dir (expand-file-name dir))) (if (ange-ftp-ftp-name ange-ftp-this-dir) (progn @@ -4005,8 +4005,13 @@ E.g., file (nconc (ange-ftp-generate-root-prefixes) (ange-ftp-real-file-name-all-completions - file ange-ftp-this-dir))) - (ange-ftp-real-file-name-completion file ange-ftp-this-dir))))) + file ange-ftp-this-dir)) + predicate) + (if predicate + (ange-ftp-real-file-name-completion + file ange-ftp-this-dir predicate) + (ange-ftp-real-file-name-completion + file ange-ftp-this-dir)))))) (defun ange-ftp-file-name-completion-1 (file tbl dir &optional predicate) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 3f514a2aaab..33006731622 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -760,17 +760,23 @@ Prompts for a URL, defaulting to the URL at or before point. Variable (interactive (browse-url-interactive-arg "URL: ")) (unless (interactive-p) (setq args (or args (list browse-url-new-window-flag)))) - (if (functionp browse-url-browser-function) - (apply browse-url-browser-function url args) - ;; The `function' can be an alist; look down it for first match - ;; and apply the function (which might be a lambda). - (catch 'done - (dolist (bf browse-url-browser-function) - (when (string-match (car bf) url) - (apply (cdr bf) url args) - (throw 'done t))) - (error "No browse-url-browser-function matching URL %s" - url)))) + (let ((process-environment (copy-sequence process-environment))) + ;; When connected to various displays, be careful to use the display of + ;; the currently selected frame, rather than the original start display, + ;; which may not even exist any more. + (if (stringp (frame-parameter (selected-frame) 'display)) + (setenv "DISPLAY" (frame-parameter (selected-frame) 'display))) + (if (functionp browse-url-browser-function) + (apply browse-url-browser-function url args) + ;; The `function' can be an alist; look down it for first match + ;; and apply the function (which might be a lambda). + (catch 'done + (dolist (bf browse-url-browser-function) + (when (string-match (car bf) url) + (apply (cdr bf) url args) + (throw 'done t))) + (error "No browse-url-browser-function matching URL %s" + url))))) ;;;###autoload (defun browse-url-at-point (&optional arg) diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el index c6506fddb93..7aa6279d92d 100644 --- a/lisp/net/eudc-bob.el +++ b/lisp/net/eudc-bob.el @@ -1,6 +1,6 @@ ;;; eudc-bob.el --- Binary Objects Support for EUDC -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index c5f31c6b2f9..706c98df371 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -1,6 +1,6 @@ ;;; eudc-export.el --- functions to export EUDC query results -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index 1e43e88dff4..84c4c2549e2 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -1,6 +1,6 @@ ;;; eudc-hotlist.el --- hotlist management for EUDC -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el index 74e3deddc06..1cf449c6f52 100644 --- a/lisp/net/eudc-vars.el +++ b/lisp/net/eudc-vars.el @@ -1,6 +1,6 @@ ;;; eudc-vars.el --- Emacs Unified Directory Client -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index 2d5d8f6978d..d209fc26e0a 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -1,6 +1,6 @@ ;;; eudc.el --- Emacs Unified Directory Client -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 0fee937758e..a4350e7c285 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -1,6 +1,6 @@ ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 9b6a77dd2e1..e48812ec2d9 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -1,6 +1,6 @@ ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el index a734b90ecaf..77f9e71878f 100644 --- a/lisp/net/eudcb-mab.el +++ b/lisp/net/eudcb-mab.el @@ -3,6 +3,7 @@ ;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@newartisans.com> +;; Maintainer: FSF ;; Keywords: comm ;; This file is part of GNU Emacs. diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el index 9edfc4870e5..44fe521b7b7 100644 --- a/lisp/net/eudcb-ph.el +++ b/lisp/net/eudcb-ph.el @@ -1,6 +1,6 @@ ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 18b96a7cce1..7f936ed0bdb 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -1,6 +1,6 @@ ;;; ldap.el --- client interface to LDAP for Emacs -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr> diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el index 158069986d2..b8bfdcc0166 100644 --- a/lisp/net/rcompile.el +++ b/lisp/net/rcompile.el @@ -1,6 +1,6 @@ ;;; rcompile.el --- run a compilation on a remote machine -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Albert <alon@milcse.rtsg.mot.com> diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el index 74b9e034f9a..6e8b073c639 100644 --- a/lisp/net/rlogin.el +++ b/lisp/net/rlogin.el @@ -1,7 +1,7 @@ ;;; rlogin.el --- remote login interface -;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman <friedman@splode.com> diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el index 62f6bb87b69..08f4659e5d9 100644 --- a/lisp/net/snmp-mode.el +++ b/lisp/net/snmp-mode.el @@ -1,6 +1,6 @@ ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode -;; Copyright (C) 1995, 1998, 2002, 2003, 2004, +;; Copyright (C) 1995, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Paul D. Smith <psmith@BayNetworks.com> diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el index 28bc552551b..1b0c50b4322 100644 --- a/lisp/net/telnet.el +++ b/lisp/net/telnet.el @@ -1,6 +1,6 @@ ;;; telnet.el --- run a telnet session from within an Emacs buffer -;; Copyright (C) 1985, 1988, 1992, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: William F. Schelter diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1ee7ca03dc5..822a995230e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -472,6 +472,17 @@ This variable defaults to the value of `tramp-encoding-shell'." (tramp-copy-args nil) (tramp-copy-keep-date-arg nil) (tramp-password-end-of-line nil)) + ("scpc" (tramp-connection-function tramp-open-connection-rsh) + (tramp-login-program "ssh") + (tramp-copy-program "scp") + (tramp-remote-sh "/bin/sh") + (tramp-login-args ("-o" "ControlPath=%t.%%r@%%h:%%p" + "-o" "ControlMaster=yes" + "-e" "none")) + (tramp-copy-args ("-o" "ControlPath=%t.%%r@%%h:%%p" + "-o" "ControlMaster=auto")) + (tramp-copy-keep-date-arg "-p") + (tramp-password-end-of-line nil)) ("scpx" (tramp-connection-function tramp-open-connection-rsh) (tramp-login-program "ssh") (tramp-copy-program "scp") @@ -566,6 +577,7 @@ pair of the form (KEY VALUE). The following KEYs are defined: If `tramp-connection-function' is `tramp-open-connection-su', then \"%u\" in this list is replaced by the user name, and \"%%\" can be used to obtain a literal percent character. + \"%t\" is replaced by the temporary file name for `scp'-like methods. * `tramp-copy-program' This specifies the name of the program to use for remotely copying the file; this might be the absolute filename of rcp or the name of @@ -672,10 +684,39 @@ various functions for details." :type '(repeat (list string function string))) (defcustom tramp-default-method - (if (and (fboundp 'executable-find) - (executable-find "pscp")) - "pscp" - "scp") + ;; An external copy method seems to be preferred, because it is much + ;; more performant for large files, and it hasn't too serious delays + ;; for small files. But it must be ensured that there aren't + ;; permanent password queries. Either a password agent like + ;; "ssh-agent" or "Pageant" shall run, or the optional password.el + ;; package shall be active for password caching. "scpc" would be + ;; another good choice because of the "ControlMaster" option, but + ;; this is a more modern alternative in OpenSSH 4, which cannot be + ;; taken as default. + (let ((e-f (fboundp 'executable-find))) + (cond + ;; PuTTY is installed. + ((and e-f (funcall 'executable-find "pscp")) + (if (or (fboundp 'password-read) + ;; Pageant is running. + (and (fboundp 'w32-window-exists-p) + (funcall 'w32-window-exists-p "Pageant" "Pageant"))) + "pscp" + "plink")) + ;; There is an ssh installation. + ((and e-f (funcall 'executable-find "scp")) + (if (or (fboundp 'password-read) + ;; ssh-agent is running. + (getenv "SSH_AUTH_SOCK") + (getenv "SSH_AGENT_PID")) + "scp" + "ssh")) + ;; Under Emacs 20, `executable-find' does not exists. So we + ;; couldn't check whether there is an ssh implementation. Let's + ;; hope the best. + ((not e-f) "ssh") + ;; Fallback. + (t "ftp"))) "*Default method to use for transferring files. See `tramp-methods' for possibilities. Also see `tramp-default-method-alist'." @@ -913,8 +954,10 @@ See also `tramp-yn-prompt-regexp'." :type 'regexp) (defcustom tramp-yn-prompt-regexp - (concat (regexp-opt '("Store key in cache? (y/n)") t) - "\\s-*") + (concat + (regexp-opt '("Store key in cache? (y/n)" + "Update cached key? (y/n, Return cancels connection)") t) + "\\s-*") "Regular expression matching all y/n queries which need to be confirmed. The confirmation should be done with y or n. The regexp should match at end of buffer. @@ -2032,7 +2075,9 @@ If VAR is nil, then we bind `v' to the structure and `multi-method', ;; Enable debugging. (def-edebug-spec with-parsed-tramp-file-name (form symbolp body)) ;; Highlight as keyword. -(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>")) +(when (functionp 'font-lock-add-keywords) + (funcall 'font-lock-add-keywords + 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>"))) (defmacro tramp-let-maybe (variable value &rest body) "Let-bind VARIABLE to VALUE in BODY, but only if VARIABLE is not obsolete. @@ -2822,17 +2867,18 @@ of." ;; The following isn't needed for Emacs 20 but for 19.34? -(defun tramp-handle-file-name-completion (filename directory) +(defun tramp-handle-file-name-completion + (filename directory &optional predicate) "Like `file-name-completion' for tramp files." (unless (tramp-tramp-file-p directory) (error "tramp-handle-file-name-completion invoked on non-tramp directory `%s'" directory)) - (with-parsed-tramp-file-name directory nil - (try-completion - filename - (mapcar (lambda (x) (cons x nil)) - (file-name-all-completions filename directory))))) + (try-completion + filename + (mapcar 'list (file-name-all-completions filename directory)) + (when predicate + (lambda (x) (funcall predicate (expand-file-name (car x) directory)))))) ;; cp, mv and ln @@ -3152,6 +3198,14 @@ be a local filename. The method used must be an out-of-band method." v2-user v2-host (tramp-shell-quote-argument v2-localname)))) + ;; Handle ControlMaster/ControlPath + (setq copy-args + (mapcar + (lambda (x) + (format-spec + x `((?t . ,(format "/tmp/%s" tramp-temp-name-prefix))))) + copy-args)) + ;; Handle keep-date argument (when keep-date (if t1 @@ -4474,7 +4528,6 @@ Falls back to normal file name handler if no tramp file name handler exists." "Checks whether method / user name / host name completion is active." (cond (tramp-completion-mode t) - ((not tramp-unified-filenames) t) ((string-match "^/.*:.*:$" file) nil) ((string-match (concat tramp-prefix-regexp @@ -4483,7 +4536,7 @@ Falls back to normal file name handler if no tramp file name handler exists." (member (match-string 1 file) (mapcar 'car tramp-methods))) ((or (equal last-input-event 'tab) ;; Emacs - (and (integerp last-input-event) + (and (wholenump last-input-event) (or ;; ?\t has event-modifier 'control (char-equal last-input-event ?\t) @@ -4585,10 +4638,14 @@ Falls back to normal file name handler if no tramp file name handler exists." ;; Method, host name and user name completion for a file. ;;;###autoload -(defun tramp-completion-handle-file-name-completion (filename directory) +(defun tramp-completion-handle-file-name-completion + (filename directory &optional predicate) "Like `file-name-completion' for tramp files." - (try-completion filename - (mapcar 'list (file-name-all-completions filename directory)))) + (try-completion + filename + (mapcar 'list (file-name-all-completions filename directory)) + (when predicate + (lambda (x) (funcall predicate (expand-file-name (car x) directory)))))) ;; I misuse a little bit the tramp-file-name structure in order to handle ;; completion possibilities for partial methods / user names / host names. @@ -5048,13 +5105,23 @@ hosts, or files, disagree." (defun tramp-touch (file time) "Set the last-modified timestamp of the given file. TIME is an Emacs internal time value as returned by `current-time'." - (let ((touch-time (format-time-string "%Y%m%d%H%M.%S" time t))) + (let* ((utc + ;; With GNU Emacs, `format-time-string' has an optional + ;; parameter UNIVERSAL. This is preferred. + (and (functionp 'subr-arity) + (= 3 (cdr (funcall (symbol-function 'subr-arity) + (symbol-function 'format-time-string)))))) + (touch-time + (if utc + (format-time-string "%Y%m%d%H%M.%S" time t) + (format-time-string "%Y%m%d%H%M.%S" time)))) (if (tramp-tramp-file-p file) (with-parsed-tramp-file-name file nil (let ((buf (tramp-get-buffer multi-method method user host))) (unless (zerop (tramp-send-command-and-check multi-method method user host - (format "TZ=UTC; export TZ; touch -t %s %s" + (format "%s touch -t %s %s" + (if utc "TZ=UTC; export TZ;" "") touch-time (tramp-shell-quote-argument localname)) t)) @@ -5491,6 +5558,7 @@ The terminal type can be configured with `tramp-terminal-type'." (defun tramp-process-actions (p multi-method method user host actions) "Perform actions until success." + (tramp-message 10 "%s" (mapconcat 'identity (process-command p) " ")) (let (exit) (while (not exit) (tramp-message 9 "Waiting for prompts from remote shell") @@ -5661,10 +5729,14 @@ arguments, and xx will be used as the host name to connect to. multi-method (tramp-find-method multi-method method user host) user host 'tramp-login-program)) - (login-args (tramp-get-method-parameter - multi-method - (tramp-find-method multi-method method user host) - user host 'tramp-login-args)) + (login-args (mapcar + (lambda (x) + (format-spec + x `((?t . ,(format "/tmp/%s" tramp-temp-name-prefix))))) + (tramp-get-method-parameter + multi-method + (tramp-find-method multi-method method user host) + user host 'tramp-login-args))) (real-host host)) ;; The following should be changed. We need a more general ;; mechanism to parse extra host args. @@ -6918,8 +6990,8 @@ localname (file name on remote host)." item) (while choices (setq item (pop choices)) - (when (and (string-match (nth 0 item) (or host "")) - (string-match (nth 1 item) (or user ""))) + (when (and (string-match (or (nth 0 item) "") (or host "")) + (string-match (or (nth 1 item) "") (or user ""))) (setq method (nth 2 item)) (setq choices nil))) method)) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 710022f885b..8061b78e124 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -30,7 +30,7 @@ ;; are auto-frobbed from configure.ac, so you should edit that file and run ;; "autoconf && ./configure" to change them. -(defconst tramp-version "2.0.54" +(defconst tramp-version "2.0.55" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index e24ce702397..cbf298e2f10 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el @@ -1,6 +1,6 @@ ;;; webjump.el --- programmable Web hotlist -;; Copyright (C) 1996, 1997, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Neil W. Van Dyke <nwv@acm.org> diff --git a/lisp/newcomment.el b/lisp/newcomment.el index d0b29d43f14..cd22a21c9c7 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -1,6 +1,6 @@ ;;; newcomment.el --- (un)comment regions of buffers -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: code extracted from Emacs-20's simple.el diff --git a/lisp/novice.el b/lisp/novice.el index ca826ca8d08..fbd2054bcb3 100644 --- a/lisp/novice.el +++ b/lisp/novice.el @@ -1,6 +1,6 @@ ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs -;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el index 95c3a0582b7..7867af0c46c 100644 --- a/lisp/obsolete/awk-mode.el +++ b/lisp/obsolete/awk-mode.el @@ -1,6 +1,6 @@ ;;; awk-mode.el --- AWK code editing commands for Emacs -;; Copyright (C) 1988, 1994, 1996, 2000, 2002, 2003, 2004, +;; Copyright (C) 1988, 1994, 1996, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index de4b494826a..e2d1d16d2a6 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -1,6 +1,6 @@ ;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org> diff --git a/lisp/obsolete/float.el b/lisp/obsolete/float.el index 32f0ef6a412..b065b4fe310 100644 --- a/lisp/obsolete/float.el +++ b/lisp/obsolete/float.el @@ -1,6 +1,6 @@ ;;; float.el --- obsolete floating point arithmetic package -;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Bill Rosenblatt diff --git a/lisp/obsolete/hscroll.el b/lisp/obsolete/hscroll.el index 0659c47c199..fdf5a7bfbea 100644 --- a/lisp/obsolete/hscroll.el +++ b/lisp/obsolete/hscroll.el @@ -1,6 +1,6 @@ ;;; hscroll.el --- automatically scroll truncated lines horizontally -;; Copyright (C) 1992, 1993, 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Wayne Mesard <wmesard@esd.sgi.com> diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el index 831ae3ffc1b..ac7d5d711ea 100644 --- a/lisp/obsolete/iso-insert.el +++ b/lisp/obsolete/iso-insert.el @@ -1,6 +1,7 @@ ;;; iso-insert.el --- insert functions for ISO 8859/1 -*- coding: iso-8859-1;-*- -;; Copyright (C) 1987, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el index 510efd32016..326029006cf 100644 --- a/lisp/obsolete/iso-swed.el +++ b/lisp/obsolete/iso-swed.el @@ -1,6 +1,6 @@ ;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el index 61b5bbeb171..de5bd094b8f 100644 --- a/lisp/obsolete/keyswap.el +++ b/lisp/obsolete/keyswap.el @@ -1,6 +1,6 @@ ;;; keyswap.el --- swap BS and DEL keys -*- no-byte-compile: t -*- -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/obsolete/mlsupport.el b/lisp/obsolete/mlsupport.el index 68ee625cd8f..ffe89c4632a 100644 --- a/lisp/obsolete/mlsupport.el +++ b/lisp/obsolete/mlsupport.el @@ -1,6 +1,6 @@ ;;; mlsupport.el --- run-time support for mocklisp code -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/ooutline.el b/lisp/obsolete/ooutline.el index 83f6fa69f30..0795031290e 100644 --- a/lisp/obsolete/ooutline.el +++ b/lisp/obsolete/ooutline.el @@ -1,6 +1,6 @@ ;;; ooutline.el --- outline mode commands for Emacs -;; Copyright (C) 1986, 1993, 1994, 1997, 2002, 2003, 2004, +;; Copyright (C) 1986, 1993, 1994, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el index 968a0bac5f6..78847e3b277 100644 --- a/lisp/obsolete/options.el +++ b/lisp/obsolete/options.el @@ -1,6 +1,6 @@ ;;; options.el --- edit Options command for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/profile.el b/lisp/obsolete/profile.el index 80b27063dbc..34170a85bc8 100644 --- a/lisp/obsolete/profile.el +++ b/lisp/obsolete/profile.el @@ -1,6 +1,6 @@ ;;; profile.el --- Emacs profiler (OBSOLETE; use elp.el instead) -;; Copyright (C) 1992, 1994, 1998, 2002, 2003, 2004, +;; Copyright (C) 1992, 1994, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boaz Ben-Zvi <boaz@lcs.mit.edu> diff --git a/lisp/obsolete/rnews.el b/lisp/obsolete/rnews.el index 89c74dd7993..d414a863884 100644 --- a/lisp/obsolete/rnews.el +++ b/lisp/obsolete/rnews.el @@ -1,6 +1,6 @@ ;;; rnews.el --- USENET news reader for GNU Emacs -;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/rnewspost.el b/lisp/obsolete/rnewspost.el index f07ce703db8..e570715f529 100644 --- a/lisp/obsolete/rnewspost.el +++ b/lisp/obsolete/rnewspost.el @@ -1,6 +1,6 @@ ;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs -;; Copyright (C) 1985, 1986, 1987, 1995, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/rsz-mini.el b/lisp/obsolete/rsz-mini.el index a9e4b007dd8..ce9cae3ff30 100644 --- a/lisp/obsolete/rsz-mini.el +++ b/lisp/obsolete/rsz-mini.el @@ -1,6 +1,6 @@ ;;; rsz-mini.el --- dynamically resize minibuffer to display entire contents -;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2002, 2003, 2004, +;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com> diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el index 905e63ea1c5..1573d0ff859 100644 --- a/lisp/obsolete/scribe.el +++ b/lisp/obsolete/scribe.el @@ -1,6 +1,6 @@ ;;; scribe.el --- scribe mode, and its idiosyncratic commands -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el index faa55fb8dd5..8d399e852d8 100644 --- a/lisp/obsolete/sun-curs.el +++ b/lisp/obsolete/sun-curs.el @@ -1,6 +1,6 @@ ;;; sun-curs.el --- cursor definitions for Sun windows -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck <peck@sun.com> diff --git a/lisp/obsolete/sun-fns.el b/lisp/obsolete/sun-fns.el index 532d28462c9..eaedf59adc4 100644 --- a/lisp/obsolete/sun-fns.el +++ b/lisp/obsolete/sun-fns.el @@ -1,6 +1,6 @@ ;;; sun-fns.el --- subroutines of Mouse handling for Sun windows -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck <peck@sun.com> diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el index 65e109ec8b4..addc7f7cbfc 100644 --- a/lisp/obsolete/swedish.el +++ b/lisp/obsolete/swedish.el @@ -1,6 +1,7 @@ ;;; swedish.el --- miscellaneous functions for dealing with Swedish -;; Copyright (C) 1988, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/obsolete/x-apollo.el b/lisp/obsolete/x-apollo.el index 869f63481ee..e67a8f09fd4 100644 --- a/lisp/obsolete/x-apollo.el +++ b/lisp/obsolete/x-apollo.el @@ -1,6 +1,6 @@ ;;; x-apollo.el --- Apollo support functions -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/obsolete/x-menu.el b/lisp/obsolete/x-menu.el index c13c9c1865b..eff1fbffb08 100644 --- a/lisp/obsolete/x-menu.el +++ b/lisp/obsolete/x-menu.el @@ -1,6 +1,6 @@ ;;; x-menu.el --- menu support for X -;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/outline.el b/lisp/outline.el index 0cd6eaa7186..95594ebec9f 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -652,19 +652,24 @@ A heading line is one that starts with a `*' (or that (if (< arg 0) (beginning-of-line) (end-of-line)) - (while (and (not (bobp)) (< arg 0)) - (while (and (not (bobp)) - (re-search-backward (concat "^\\(?:" outline-regexp "\\)") - nil 'move) - (outline-invisible-p))) - (setq arg (1+ arg))) - (while (and (not (eobp)) (> arg 0)) - (while (and (not (eobp)) - (re-search-forward (concat "^\\(?:" outline-regexp "\\)") - nil 'move) - (outline-invisible-p (match-beginning 0)))) - (setq arg (1- arg))) - (beginning-of-line)) + (let (found-heading-p) + (while (and (not (bobp)) (< arg 0)) + (while (and (not (bobp)) + (setq found-heading-p + (re-search-backward + (concat "^\\(?:" outline-regexp "\\)") + nil 'move)) + (outline-invisible-p))) + (setq arg (1+ arg))) + (while (and (not (eobp)) (> arg 0)) + (while (and (not (eobp)) + (setq found-heading-p + (re-search-forward + (concat "^\\(?:" outline-regexp "\\)") + nil 'move)) + (outline-invisible-p (match-beginning 0)))) + (setq arg (1- arg))) + (if found-heading-p (beginning-of-line)))) (defun outline-previous-visible-heading (arg) "Move to the previous heading line. @@ -690,6 +695,11 @@ This puts point at the start of the current subtree, and mark at the end." (goto-char beg))) +(defvar outline-isearch-open-invisible-function nil + "Function called if `isearch' finishes in an invisible overlay. +The function is called with the overlay as its only argument. +If nil, `show-entry' is called to reveal the invisible text.") + (put 'outline 'reveal-toggle-invisible 'outline-reveal-toggle-invisible) (defun outline-flag-region (from to flag) "Hide or show lines from FROM to TO, according to FLAG. @@ -698,7 +708,9 @@ If FLAG is nil then text is shown, while if FLAG is t the text is hidden." (when flag (let ((o (make-overlay from to))) (overlay-put o 'invisible 'outline) - (overlay-put o 'isearch-open-invisible 'outline-isearch-open-invisible))) + (overlay-put o 'isearch-open-invisible + (or outline-isearch-open-invisible-function + 'outline-isearch-open-invisible)))) ;; Seems only used by lazy-lock. I.e. obsolete. (run-hooks 'outline-view-change-hook)) @@ -894,7 +906,8 @@ Show the heading too, if it is currently invisible." (or first (> (funcall outline-level) level))) (setq first nil) (outline-next-heading)) - (if (bolp) + (if (and (bolp) (not (eolp))) + ;; We stopped at a nonempty line (the next heading). (progn ;; Go to end of line before heading (forward-char -1) diff --git a/lisp/paths.el b/lisp/paths.el index 022f12dd1fc..1d8f8c45ed7 100644 --- a/lisp/paths.el +++ b/lisp/paths.el @@ -1,6 +1,6 @@ ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*- -;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2002, 2003, +;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el index 5915b5f5a9d..265110358c7 100644 --- a/lisp/pcmpl-cvs.el +++ b/lisp/pcmpl-cvs.el @@ -1,6 +1,6 @@ ;;; pcmpl-cvs.el --- functions for dealing with cvs completions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el index 7dc7808404f..632cf6731e8 100644 --- a/lisp/pcmpl-gnu.el +++ b/lisp/pcmpl-gnu.el @@ -1,6 +1,6 @@ ;;; pcmpl-gnu.el --- completions for GNU project tools -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el index bd68d00ce76..c4e56301c7f 100644 --- a/lisp/pcmpl-linux.el +++ b/lisp/pcmpl-linux.el @@ -1,6 +1,6 @@ ;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el index 5855a3e5d15..0a8df84a689 100644 --- a/lisp/pcmpl-rpm.el +++ b/lisp/pcmpl-rpm.el @@ -1,6 +1,6 @@ ;;; pcmpl-rpm.el --- functions for dealing with rpm completions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index 35637c01363..74b162b5871 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -1,6 +1,6 @@ ;;; pcmpl-unix.el --- standard UNIX completions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el index d0c1950f1f8..ac224d3a18a 100644 --- a/lisp/pcvs-defs.el +++ b/lisp/pcvs-defs.el @@ -1,7 +1,7 @@ ;;; pcvs-defs.el --- variable definitions for PCL-CVS ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index 085f294e6fb..b782f0b960d 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el @@ -1,7 +1,7 @@ ;;; pcvs-info.el --- internal representation of a fileinfo entry ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index bd493126532..f69f275246a 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -1,7 +1,7 @@ ;;; pcvs-parse.el --- the CVS output parser ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 52237005d22..001053f742a 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -1,7 +1,7 @@ ;;; pcvs.el --- a front-end to CVS ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com ;; (Per Cederqvist) ceder@lysator.liu.se diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el index 790b6bd1e6b..95f0d7658f6 100644 --- a/lisp/pgg-def.el +++ b/lisp/pgg-def.el @@ -71,9 +71,7 @@ Whether the passphrase is cached at all is controlled by :group 'pgg :type 'integer) -(defcustom pgg-passphrase-coding-system - (if (boundp 'locale-coding-system) - locale-coding-system) +(defcustom pgg-passphrase-coding-system nil "Coding system to encode passphrase." :group 'pgg :type 'coding-system) diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 4b8b79b068e..514be51a6a3 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -52,7 +52,7 @@ :type '(choice (const :tag "New `--recipient' option" "--recipient") (const :tag "Old `--remote-user' option" "--remote-user"))) -(defcustom pgg-gpg-use-agent nil +(defcustom pgg-gpg-use-agent t "Whether to use gnupg agent for key caching." :group 'pgg-gpg :type 'boolean) @@ -94,8 +94,10 @@ (if pgg-passphrase-coding-system (progn (setq encoded-passphrase-with-new-line - (encode-coding-string passphrase-with-newline - pgg-passphrase-coding-system)) + (encode-coding-string + passphrase-with-newline + (coding-system-change-eol-conversion + pgg-passphrase-coding-system 'unix))) (pgg-clear-string passphrase-with-newline)) (setq encoded-passphrase-with-new-line passphrase-with-newline passphrase-with-newline nil)) diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index db76fbb7725..c9850c3afab 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -1,6 +1,6 @@ ;;; 5x5.el --- simple little puzzle game -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Pearson <davep@davep.org> diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el index 98294884ebd..185cb5ad264 100644 --- a/lisp/play/bruce.el +++ b/lisp/play/bruce.el @@ -1,7 +1,7 @@ ;;; bruce.el --- bruce phrase utility for overloading the Communications -*- no-byte-compile: t -*- ;;; Decency Act snoops, if any. -;; Copyright (C) 1988, 1993, 1997, 2002, 2003, 2004, +;; Copyright (C) 1988, 1993, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el index 7a2e6c602ea..c4c90a83c36 100644 --- a/lisp/play/cookie1.el +++ b/lisp/play/cookie1.el @@ -1,6 +1,6 @@ ;;; cookie1.el --- retrieve random phrases from fortune cookie files -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, 2006, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, ;; 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index 88b5f2ace46..a8e4ec4c48b 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -1,6 +1,6 @@ ;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers ;; -;; Copyright (C) 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Christopher J. Madsen <chris_madsen@geocities.com> diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el index ce1f8b55432..b6333234523 100644 --- a/lisp/play/dissociate.el +++ b/lisp/play/dissociate.el @@ -1,6 +1,6 @@ ;;; dissociate.el --- scramble text amusingly for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el index 32dfd6254c3..9a3c45cb3aa 100644 --- a/lisp/play/doctor.el +++ b/lisp/play/doctor.el @@ -1,6 +1,6 @@ ;;; doctor.el --- psychological help for frustrated users -;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2002, 2003, 2004, +;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el index 3cc91226fe8..5b41cffbb8a 100644 --- a/lisp/play/gamegrid.el +++ b/lisp/play/gamegrid.el @@ -1,6 +1,6 @@ ;;; gamegrid.el --- library for implementing grid-based games on Emacs -;; Copyright (C) 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk> diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index 82eef652f52..cb556bc0b42 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el @@ -1,6 +1,6 @@ ;;; gametree.el --- manage game analysis trees in Emacs -;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ian T Zimmerman <itz@rahul.net> diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el index 578f9a8e0b6..a1dc520973e 100644 --- a/lisp/play/handwrite.el +++ b/lisp/play/handwrite.el @@ -1,6 +1,6 @@ ;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*- -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>) diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index f947a8caeaa..3df56133135 100644 --- a/lisp/play/landmark.el +++ b/lisp/play/landmark.el @@ -1,6 +1,6 @@ ;;; landmark.el --- neural-network robot that learns landmarks -;; Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>) diff --git a/lisp/play/morse.el b/lisp/play/morse.el index bf5abdfbd4c..8d569ed3845 100644 --- a/lisp/play/morse.el +++ b/lisp/play/morse.el @@ -1,6 +1,6 @@ ;;; morse.el --- convert text to morse code and back -*- coding: utf-8 -*- -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM> diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el index ebeeb3159f8..6d1cb7a96f6 100644 --- a/lisp/play/mpuz.el +++ b/lisp/play/mpuz.el @@ -1,6 +1,6 @@ ;;; mpuz.el --- multiplication puzzle for GNU Emacs -;; Copyright (C) 1990, 2002, 2003, 2004, 2005, +;; Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr> diff --git a/lisp/play/snake.el b/lisp/play/snake.el index ae942212a18..db15e98c47b 100644 --- a/lisp/play/snake.el +++ b/lisp/play/snake.el @@ -1,6 +1,6 @@ ;;; snake.el --- implementation of Snake for Emacs -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk> diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el index d6faeb5e5ad..a67021c8764 100644 --- a/lisp/play/solitaire.el +++ b/lisp/play/solitaire.el @@ -1,6 +1,6 @@ ;;; solitaire.el --- game of solitaire in Emacs Lisp -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jan Schormann <Jan.Schormann@rechen-gilde.de> diff --git a/lisp/play/spook.el b/lisp/play/spook.el index fbad9ab0f13..828b0a594af 100644 --- a/lisp/play/spook.el +++ b/lisp/play/spook.el @@ -1,6 +1,6 @@ ;;; spook.el --- spook phrase utility for overloading the NSA line eater -;; Copyright (C) 1988, 1993, 2002, 2003, 2004, +;; Copyright (C) 1988, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el index 531d61e20e6..f9fc3f9f0ab 100644 --- a/lisp/play/tetris.el +++ b/lisp/play/tetris.el @@ -1,6 +1,6 @@ ;;; tetris.el --- implementation of Tetris for Emacs -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk> diff --git a/lisp/play/yow.el b/lisp/play/yow.el index b86ad9d4c66..cc79c5a87a5 100644 --- a/lisp/play/yow.el +++ b/lisp/play/yow.el @@ -1,6 +1,6 @@ ;;; yow.el --- quote random zippyisms -;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/printing.el b/lisp/printing.el index d99d6985af4..4a41dac8dc4 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2006/11/08 12:01:50 vinicius> ;; Keywords: wp, print, PostScript ;; Version: 6.8.4 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre @@ -3113,7 +3112,9 @@ Calls `pr-update-menus' to adjust menus." (pr-get-symbol (nth 1 menu-file)) (pr-get-symbol "Print")))) (t - (easy-menu-change (cdr menu-file) "Print" pr-menu-spec)))))))) + (easy-menu-add-item global-map menu-file + (easy-menu-create-menu "Print" pr-menu-spec))) + )))))) (pr-update-menus t)) diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 6c59560094a..9996a697bb2 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -117,7 +117,7 @@ the filename at the end. This is the same syntax as in the project file." " ${comp_opt}") "*Default command to be used to compile a single file. Emacs will substitute the current filename for ${full_current}, or add -the filename at the end. This is the same syntax as in the project file." +the filename at the end. This is the same syntax as in the project file." :type 'string :group 'ada) (defcustom ada-prj-default-debugger "${cross_prefix}gdb" @@ -148,7 +148,7 @@ Otherwise, ask the user for the name of the project file to use." :type 'boolean :group 'ada) (defconst is-windows (memq system-type (quote (windows-nt))) - "True if we are running on Windows NT or Windows 95.") + "True if we are running on Windows.") (defcustom ada-tight-gvd-integration nil "*If non-nil, a new Emacs frame will be swallowed in GVD when debugging. @@ -208,7 +208,7 @@ we need to use `/d' or the drive is never changed.") \"&&\" for now.") (defconst ada-xref-pos-ring-max 16 - "Number of positions kept in the list ada-xref-pos-ring.") + "Number of positions kept in the list `ada-xref-pos-ring'.") (defvar ada-operator-re "\\+\\|-\\|/\\|\\*\\*\\|\\*\\|=\\|&\\|abs\\|mod\\|rem\\|and\\|not\\|or\\|xor\\|<=\\|<\\|>=\\|>" @@ -218,11 +218,11 @@ we need to use `/d' or the drive is never changed.") "Associative list of project files with properties. It has the format: (project project ...) A project has the format: (project-file . project-plist) -\(See 'apropos plist' for operations on property lists). See -ada-xref-set-default-prj-values for the list of valid properties. The -current project is retrieved with ada-xref-current-project. Properties -are retrieved with ada-xref-get-project-field, set with -ada-xref-set-project-field. If project properties are accessed with no +\(See 'apropos plist' for operations on property lists). +See `ada-xref-set-default-prj-values' for the list of valid properties. +The current project is retrieved with `ada-xref-current-project'. +Properties are retrieved with `ada-xref-get-project-field', set with +`ada-xref-set-project-field'. If project properties are accessed with no project file, a (nil . default-properties) entry is created.") @@ -257,7 +257,7 @@ project file, a (nil . default-properties) entry is created.") ;; ----------------------------------------------------------------------- (defun ada-quote-cmd (cmd) - "Duplicate all \\ characters in CMD so that it can be passed to `compile'." + "Duplicate all `\\' characters in CMD so that it can be passed to `compile'." (mapconcat 'identity (split-string cmd "\\\\") "\\\\")) (defun ada-find-executable (exec-name) @@ -418,8 +418,8 @@ replaced by the name including the extension." Project variables are substituted. Note that for src_dir and obj_dir, you should rather use -`ada-xref-get-src-dir-field' or `ada-xref-get-obj-dir-field' which will in -addition return the default paths." +`ada-xref-get-src-dir-field' or `ada-xref-get-obj-dir-field' +which will in addition return the default paths." (let* ((project-plist (cdr (ada-xref-current-project))) value) @@ -1166,7 +1166,7 @@ If ARG is not nil, ask for user confirmation." "Recompile the current file. If ARG is not nil, ask for user confirmation of the command. PRJ-FIELD is the name of the field to use in the project file to get the -command, and should be either comp_cmd (default) or check_cmd." +command, and should be either `comp_cmd' (default) or `check_cmd'." (interactive "P") (ada-require-project-file) (let* ((field (if prj-field prj-field 'comp_cmd)) @@ -1190,7 +1190,7 @@ command, and should be either comp_cmd (default) or check_cmd." (compile (ada-quote-cmd cmd)))) (defun ada-check-current (&optional arg) - "Recompile the current file. + "Check the current file for syntax errors. If ARG is not nil, ask for user confirmation of the command." (interactive "P") (ada-compile-current arg 'check_cmd)) @@ -1368,8 +1368,8 @@ project file." "Update the cross-references for FILE. This in fact recompiles FILE to create ALI-FILE-NAME. This function returns the name of the file that was recompiled to generate -the cross-reference information. Note that the ali file can then be deduced by -replacing the file extension with `.ali'." +the cross-reference information. Note that the ali file can then be deduced +by replacing the file extension with `.ali'." ;; kill old buffer (if (and ali-file-name (get-file-buffer ali-file-name)) @@ -1539,8 +1539,8 @@ the project file." (defun ada-get-ada-file-name (file original-file) "Create the complete file name (+directory) for FILE. -The original file (where the user was) is ORIGINAL-FILE. Search in project -file for possible paths." +The original file (where the user was) is ORIGINAL-FILE. +Search in project file for possible paths." (save-excursion @@ -1940,9 +1940,8 @@ This function attempts to find the possible declarations for the identifier anywhere in the object path. This command requires the external `egrep' program to be available. -This works well when one is using an external librarie and wants -to find the declaration and documentation of the subprograms one is -is using." +This works well when one is using an external librarie and wants to find +the declaration and documentation of the subprograms one is using." ;; FIXME: what does this function do? (let (list (dirs (ada-xref-get-obj-dir-field)) @@ -2212,6 +2211,7 @@ This is a GNAT specific function that uses gnatkrunch." (defun ada-make-body-gnatstub (&optional interactive) "Create an Ada package body in the current buffer. This function uses the `gnatstub' program to create the body. +If INTERACTIVE is nil, kill the current buffer. This function typically is to be hooked into `ff-file-created-hook'." (interactive "p") (ada-require-project-file) @@ -2221,9 +2221,8 @@ This function typically is to be hooked into `ff-file-created-hook'." ;; If the current buffer is the body (as is the case when calling this ;; function from ff-file-created-hook), then kill this temporary buffer (unless interactive - (progn - (set-buffer-modified-p nil) - (kill-buffer (current-buffer)))) + (set-buffer-modified-p nil) + (kill-buffer (current-buffer))) ;; Make sure the current buffer is the spec (this might not be the case @@ -2274,7 +2273,7 @@ This function typically is to be hooked into `ff-file-created-hook'." (defun ada-xref-initialize () "Function called by `ada-mode-hook' to initialize the ada-xref.el package. For instance, it creates the gnat-specific menus, sets some hooks for -`find-file'..." +`find-file'." (remove-hook 'ff-file-created-hook 'ada-make-body) ; from global hook (remove-hook 'ff-file-created-hook 'ada-make-body t) ; from local hook (add-hook 'ff-file-created-hook 'ada-make-body-gnatstub nil t) diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index fe021d04cea..08a849b16bc 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -1,6 +1,6 @@ ;;; autoconf.el --- mode for editing Autoconf configure.in files -;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005, 2006 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el index 53711ecb951..9c2427a71af 100644 --- a/lisp/progmodes/cc-align.el +++ b/lisp/progmodes/cc-align.el @@ -1,7 +1,8 @@ ;;; cc-align.el --- custom indentation functions for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index c93843f3f82..e2fcbd8d06b 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -1,7 +1,7 @@ ;;; cc-awk.el --- AWK specific code within cc-mode. -;; Copyright (C) 1988,94,96,2000, 2001, 2002, 2003, 2004, 2005, 2006 Free -;; Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el) ;; Maintainer: FSF diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index b876930f34a..1c266e8a5de 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1,7 +1,8 @@ ;;; cc-cmds.el --- user level commands for CC Mode -;; Copyright (C) 1985, 1987, 1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el index d08c9fc0162..4d0266ec41c 100644 --- a/lisp/progmodes/cc-compat.el +++ b/lisp/progmodes/cc-compat.el @@ -1,7 +1,8 @@ ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1994-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index ecad9174e57..df2f247f048 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -1,7 +1,8 @@ ;;; cc-defs.el --- compile time definitions for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 32c82eb1c1d..5cb00929007 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -1,7 +1,8 @@ ;;; cc-engine.el --- core syntax guessing engine for CC mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 8473eee90a2..ab31fa877f7 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1179,7 +1179,7 @@ casts and declarations are fontified. Used on level 2 and higher." ;; The below code attempts to fontify the case constants in ;; c-label-face-name, but it cannot catch every case [sic]. ;; And do we want to fontify case constants anyway? - nil + (c-forward-label t match-pos nil) ;;; (when (c-forward-label t match-pos nil) ;;; ;; Can't use `c-fontify-types-and-refs' here since we ;;; ;; should use the label face. diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index d29e75e92f0..bd9af00d9c6 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1,7 +1,8 @@ ;;; cc-langs.el --- language specific settings for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw @@ -1330,7 +1331,7 @@ properly." (c-lang-defconst c-at-vsemi-p-fn "Contains a function \"Is there a virtual semicolon at POS or point?\". Such a function takes one optional parameter, a buffer position (defaults to -point), and returns NIL or t. This variable contains NIL for languages which +point), and returns nil or t. This variable contains nil for languages which don't have EOL terminated statements. " t nil awk 'c-awk-at-vsemi-p) @@ -1341,7 +1342,7 @@ don't have EOL terminated statements. " The (admittedly kludgey) purpose of such a function is to prevent an infinite recursion in c-beginning-of-statement-1 when point starts at a `while' token. The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, -even indirectly. This variable contains NIL for languages which don't have +even indirectly. This variable contains nil for languages which don't have EOL terminated statements." t nil awk 'c-awk-vsemi-status-unknown-p) diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index b925d1e653c..c54d73db513 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -1,7 +1,8 @@ ;;; cc-menus.el --- imenu support for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index eb5ae4b63b6..40407f3819a 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1,7 +1,8 @@ ;;; cc-mode.el --- major mode for editing C and similar languages -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 1998- Martin Stjernholm @@ -530,9 +531,11 @@ that requires a literal mode spec at compile time." ;; heuristic that open parens in column 0 are defun starters. Since ;; we have c-state-cache, that heuristic isn't useful and only causes ;; trouble, so turn it off. - (when (memq 'col-0-paren c-emacs-features) - (make-local-variable 'open-paren-in-column-0-is-defun-start) - (setq open-paren-in-column-0-is-defun-start nil)) +;; 2006/12/17: This facility is somewhat confused, and doesn't really seem +;; helpful. Comment it out for now. +;; (when (memq 'col-0-paren c-emacs-features) +;; (make-local-variable 'open-paren-in-column-0-is-defun-start) +;; (setq open-paren-in-column-0-is-defun-start nil)) (c-clear-found-types) diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index c2b9b435e4c..81048d52072 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -1,7 +1,8 @@ ;;; cc-styles.el --- support for styles in CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 2abc7667a59..0f0da939230 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1,7 +1,8 @@ ;;; cc-vars.el --- user customization variables for CC Mode -;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software +;; Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 983087d07bc..14cbaf9c0f4 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1681,9 +1681,8 @@ or as help on variables `cperl-tips', `cperl-problems', [(control c) (control h) f]))) (setq major-mode cperl-use-major-mode) (setq mode-name "CPerl") - (if (not cperl-mode-abbrev-table) - (let ((prev-a-c abbrevs-changed)) - (define-abbrev-table 'cperl-mode-abbrev-table '( + (let ((prev-a-c abbrevs-changed)) + (define-abbrev-table 'cperl-mode-abbrev-table '( ("if" "if" cperl-electric-keyword 0) ("elsif" "elsif" cperl-electric-keyword 0) ("while" "while" cperl-electric-keyword 0) @@ -1704,7 +1703,7 @@ or as help on variables `cperl-tips', `cperl-problems', ("over" "over" cperl-electric-pod 0) ("head1" "head1" cperl-electric-pod 0) ("head2" "head2" cperl-electric-pod 0))) - (setq abbrevs-changed prev-a-c))) + (setq abbrevs-changed prev-a-c)) (setq local-abbrev-table cperl-mode-abbrev-table) (if (cperl-val 'cperl-electric-keywords) (abbrev-mode 1)) diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el index f393f78203b..604061c7558 100644 --- a/lisp/progmodes/ebnf-abn.el +++ b/lisp/progmodes/ebnf-abn.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/04/03 16:43:57 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 1.1 diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el index fd58ec096b3..b1b57ee1682 100644 --- a/lisp/progmodes/ebnf-bnf.el +++ b/lisp/progmodes/ebnf-bnf.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/04/03 16:42:18 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 1.9 diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index a52469966fc..c0a4c7b5176 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/04/04 21:50:16 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 1.0 diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el index 7e65611cedf..9c9e514ded2 100644 --- a/lisp/progmodes/ebnf-ebx.el +++ b/lisp/progmodes/ebnf-ebx.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/04/03 16:45:34 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 1.1 diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el index 7596d366a12..c3d4abd7633 100644 --- a/lisp/progmodes/ebnf-iso.el +++ b/lisp/progmodes/ebnf-iso.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/04/03 16:48:52 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 1.8 diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el index df18beb690a..5fbcb210565 100644 --- a/lisp/progmodes/ebnf-otz.el +++ b/lisp/progmodes/ebnf-otz.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/11/19 22:24:07 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 1.0 diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el index 6e5465f0f01..61f710cb789 100644 --- a/lisp/progmodes/ebnf-yac.el +++ b/lisp/progmodes/ebnf-yac.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2004/04/03 16:50:46 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 1.3 diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index eb203249253..611273f8b5f 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -5,7 +5,6 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Time-stamp: <2006/09/26 21:49:46 vinicius> ;; Keywords: wp, ebnf, PostScript ;; Version: 4.3 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 6b0a44f44ab..e1cd25934f8 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -674,76 +674,78 @@ Used in the F90 entry in `hs-special-modes-alist'.") ;; Abbrevs have generally two letters, except standard types `c, `i, `r, `t. (defvar f90-mode-abbrev-table - (let (abbrevs-changed) + (progn (define-abbrev-table 'f90-mode-abbrev-table nil) - ;; Use the 6th arg (SYSTEM-FLAG) of define-abbrev if possible. - ;; A little baroque to quieten the byte-compiler. - (mapcar - (function (lambda (element) - (condition-case nil - (apply 'define-abbrev f90-mode-abbrev-table - (append element '(nil 0 t))) - (wrong-number-of-arguments - (apply 'define-abbrev f90-mode-abbrev-table - (append element '(nil 0))))))) - '(("`al" "allocate" ) - ("`ab" "allocatable" ) - ("`as" "assignment" ) - ("`ba" "backspace" ) - ("`bd" "block data" ) - ("`c" "character" ) - ("`cl" "close" ) - ("`cm" "common" ) - ("`cx" "complex" ) - ("`cn" "contains" ) - ("`cy" "cycle" ) - ("`de" "deallocate" ) - ("`df" "define" ) - ("`di" "dimension" ) - ("`dp" "double precision") - ("`dw" "do while" ) - ("`el" "else" ) - ("`eli" "else if" ) - ("`elw" "elsewhere" ) - ("`eq" "equivalence" ) - ("`ex" "external" ) - ("`ey" "entry" ) - ("`fl" "forall" ) - ("`fo" "format" ) - ("`fu" "function" ) - ("`fa" ".false." ) - ("`im" "implicit none") - ("`in" "include" ) - ("`i" "integer" ) - ("`it" "intent" ) - ("`if" "interface" ) - ("`lo" "logical" ) - ("`mo" "module" ) - ("`na" "namelist" ) - ("`nu" "nullify" ) - ("`op" "optional" ) - ("`pa" "parameter" ) - ("`po" "pointer" ) - ("`pr" "print" ) - ("`pi" "private" ) - ("`pm" "program" ) - ("`pu" "public" ) - ("`r" "real" ) - ("`rc" "recursive" ) - ("`rt" "return" ) - ("`rw" "rewind" ) - ("`se" "select" ) - ("`sq" "sequence" ) - ("`su" "subroutine" ) - ("`ta" "target" ) - ("`tr" ".true." ) - ("`t" "type" ) - ("`wh" "where" ) - ("`wr" "write" ))) f90-mode-abbrev-table) "Abbrev table for F90 mode.") - +(let (abbrevs-changed) + ;; Use the 6th arg (SYSTEM-FLAG) of define-abbrev if possible. + ;; A little baroque to quieten the byte-compiler. + (mapcar + (function (lambda (element) + (condition-case nil + (apply 'define-abbrev f90-mode-abbrev-table + (append element '(nil 0 t))) + (wrong-number-of-arguments + (apply 'define-abbrev f90-mode-abbrev-table + (append element '(nil 0))))))) + '(("`al" "allocate" ) + ("`ab" "allocatable" ) + ("`as" "assignment" ) + ("`ba" "backspace" ) + ("`bd" "block data" ) + ("`c" "character" ) + ("`cl" "close" ) + ("`cm" "common" ) + ("`cx" "complex" ) + ("`cn" "contains" ) + ("`cy" "cycle" ) + ("`de" "deallocate" ) + ("`df" "define" ) + ("`di" "dimension" ) + ("`dp" "double precision") + ("`dw" "do while" ) + ("`el" "else" ) + ("`eli" "else if" ) + ("`elw" "elsewhere" ) + ("`eq" "equivalence" ) + ("`ex" "external" ) + ("`ey" "entry" ) + ("`fl" "forall" ) + ("`fo" "format" ) + ("`fu" "function" ) + ("`fa" ".false." ) + ("`im" "implicit none") + ("`in" "include" ) + ("`i" "integer" ) + ("`it" "intent" ) + ("`if" "interface" ) + ("`lo" "logical" ) + ("`mo" "module" ) + ("`na" "namelist" ) + ("`nu" "nullify" ) + ("`op" "optional" ) + ("`pa" "parameter" ) + ("`po" "pointer" ) + ("`pr" "print" ) + ("`pi" "private" ) + ("`pm" "program" ) + ("`pu" "public" ) + ("`r" "real" ) + ("`rc" "recursive" ) + ("`rt" "return" ) + ("`rw" "rewind" ) + ("`se" "select" ) + ("`sq" "sequence" ) + ("`su" "subroutine" ) + ("`ta" "target" ) + ("`tr" ".true." ) + ("`t" "type" ) + ("`wh" "where" ) + ("`wr" "write" )))) + + ;;;###autoload (defun f90-mode () "Major mode for editing Fortran 90,95 code in free format. diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index fcc9db1c3ef..5c97f60e204 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -604,80 +604,82 @@ Used in the Fortran entry in `hs-special-modes-alist'.") (defvar fortran-mode-abbrev-table - (let (abbrevs-changed) + (progn (define-abbrev-table 'fortran-mode-abbrev-table nil) - ;; Use the 6th arg (SYSTEM-FLAG) of define-abbrev if possible. - ;; Only use `apply' to quieten the byte-compiler. - (mapcar - (function (lambda (element) - (condition-case nil - (apply 'define-abbrev fortran-mode-abbrev-table - (append element '(nil 0 t))) - (wrong-number-of-arguments - (apply 'define-abbrev fortran-mode-abbrev-table - (append element '(nil 0))))))) - '((";au" "automatic" ) - (";b" "byte" ) - (";bd" "block data" ) - (";ch" "character" ) - (";cl" "close" ) - (";c" "continue" ) - (";cm" "common" ) - (";cx" "complex" ) - (";df" "define" ) - (";di" "dimension" ) - (";do" "double" ) - (";dc" "double complex" ) - (";dp" "double precision" ) - (";dw" "do while" ) - (";e" "else" ) - (";ed" "enddo" ) - (";el" "elseif" ) - (";en" "endif" ) - (";eq" "equivalence" ) - (";ew" "endwhere" ) - (";ex" "external" ) - (";ey" "entry" ) - (";f" "format" ) - (";fa" ".false." ) - (";fu" "function" ) - (";g" "goto" ) - (";im" "implicit" ) - (";ib" "implicit byte" ) - (";ic" "implicit complex" ) - (";ich" "implicit character") - (";ii" "implicit integer" ) - (";il" "implicit logical" ) - (";ir" "implicit real" ) - (";inc" "include" ) - (";in" "integer" ) - (";intr" "intrinsic" ) - (";l" "logical" ) - (";n" "namelist" ) - (";o" "open" ) ; was ;op - (";pa" "parameter" ) - (";pr" "program" ) - (";ps" "pause" ) - (";p" "print" ) - (";rc" "record" ) - (";re" "real" ) - (";r" "read" ) - (";rt" "return" ) - (";rw" "rewind" ) - (";s" "stop" ) - (";sa" "save" ) - (";st" "structure" ) - (";sc" "static" ) - (";su" "subroutine" ) - (";tr" ".true." ) - (";ty" "type" ) - (";vo" "volatile" ) - (";w" "write" ) - (";wh" "where" ))) - fortran-mode-abbrev-table)) + fortran-mode-abbrev-table) + "Abbrev table for Fortran mode.") + +(let (abbrevs-changed) + ;; Use the 6th arg (SYSTEM-FLAG) of define-abbrev if possible. + ;; Only use `apply' to quieten the byte-compiler. + (mapcar + (function (lambda (element) + (condition-case nil + (apply 'define-abbrev fortran-mode-abbrev-table + (append element '(nil 0 t))) + (wrong-number-of-arguments + (apply 'define-abbrev fortran-mode-abbrev-table + (append element '(nil 0))))))) + '((";au" "automatic" ) + (";b" "byte" ) + (";bd" "block data" ) + (";ch" "character" ) + (";cl" "close" ) + (";c" "continue" ) + (";cm" "common" ) + (";cx" "complex" ) + (";df" "define" ) + (";di" "dimension" ) + (";do" "double" ) + (";dc" "double complex" ) + (";dp" "double precision" ) + (";dw" "do while" ) + (";e" "else" ) + (";ed" "enddo" ) + (";el" "elseif" ) + (";en" "endif" ) + (";eq" "equivalence" ) + (";ew" "endwhere" ) + (";ex" "external" ) + (";ey" "entry" ) + (";f" "format" ) + (";fa" ".false." ) + (";fu" "function" ) + (";g" "goto" ) + (";im" "implicit" ) + (";ib" "implicit byte" ) + (";ic" "implicit complex" ) + (";ich" "implicit character") + (";ii" "implicit integer" ) + (";il" "implicit logical" ) + (";ir" "implicit real" ) + (";inc" "include" ) + (";in" "integer" ) + (";intr" "intrinsic" ) + (";l" "logical" ) + (";n" "namelist" ) + (";o" "open" ) ; was ;op + (";pa" "parameter" ) + (";pr" "program" ) + (";ps" "pause" ) + (";p" "print" ) + (";rc" "record" ) + (";re" "real" ) + (";r" "read" ) + (";rt" "return" ) + (";rw" "rewind" ) + (";s" "stop" ) + (";sa" "save" ) + (";st" "structure" ) + (";sc" "static" ) + (";su" "subroutine" ) + (";tr" ".true." ) + (";ty" "type" ) + (";vo" "volatile" ) + (";w" "write" ) + (";wh" "where" )))) - ;;;###autoload (defun fortran-mode () "Major mode for editing Fortran code in fixed format. diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 225952366dd..3a253796f28 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -40,8 +40,8 @@ ;; This file has evolved from gdba.el that was included with GDB 5.0 and ;; written by Tom Lord and Jim Kingdon. It uses GDB's annotation interface. ;; You don't need to know about annotations to use this mode as a debugger, -;; but if you are interested developing the mode itself, then see the -;; Annotations section in the GDB info manual. +;; but if you are interested developing the mode itself, see the Annotations +;; section in the GDB info manual. ;; GDB developers plan to make the annotation interface obsolete. A new ;; interface called GDB/MI (machine interface) has been designed to replace @@ -51,9 +51,9 @@ ;; still under development and is part of a process to migrate Emacs from ;; annotations to GDB/MI. -;; This mode SHOULD WORK WITH GDB 5.0 onwards but you will NEED GDB 6.0 -;; onwards to use watch expressions. It works best with GDB 6.4 where -;; watch expressions will update more quickly. +;; This mode SHOULD WORK WITH GDB 5.0 or later but you will NEED AT LEAST +;; GDB 6.0 to use watch expressions. It works best with GDB 6.4 or later +;; where watch expressions will update more quickly. ;;; Windows Platforms: @@ -79,14 +79,18 @@ ;; 5) If you wish to call procedures from your program in GDB ;; e.g "call myproc ()", "p mysquare (5)" then use level 2 annotations ;; "gdb --annotate=2 myprog" to keep source buffer/selected frame fixed. +;; 6) After detaching from a process, clicking on the "GO" icon on toolbar +;; (gud-go) sends "continue" to GDB (should be "run"). ;;; Problems with watch expressions, GDB/MI: + ;; 1) They go out of scope when the inferior is re-run. ;; 2) -stack-list-locals has a type field but also prints type in values field. ;; 3) VARNUM increments even when variable object is not created ;; (maybe trivial). ;;; TODO: + ;; 1) Use MI command -data-read-memory for memory window. ;; 2) Use tree-widget.el instead of the speedbar for watch-expressions? ;; 3) Mark breakpoint locations on scroll-bar of source buffer? @@ -706,11 +710,6 @@ With arg, enter name of variable to be watched in the minibuffer." (buffer-substring (region-beginning) (region-end)) (tooltip-identifier-from-point (point)))))) (speedbar 1) - (catch 'already-watched - (dolist (var gdb-var-list) - (unless (string-match "\\." (car var)) - (if (string-equal expr (nth 1 var)) - (throw 'already-watched nil)))) (set-text-properties 0 (length expr) nil expr) (gdb-enqueue-input (list @@ -718,7 +717,7 @@ With arg, enter name of variable to be watched in the minibuffer." (concat "server interpreter mi \"-var-create - * " expr "\"\n") (concat"-var-create - * " expr "\n")) - `(lambda () (gdb-var-create-handler ,expr)))))))) + `(lambda () (gdb-var-create-handler ,expr))))))) (message "gud-watch is a no-op in this mode.")))) (defconst gdb-var-create-regexp @@ -847,29 +846,29 @@ type_changed=\".*?\".*?}") (interactive) (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer) '(gdbmi gdba)) - (let ((text (speedbar-line-text))) - ;; Can't use \\S-+ for whitespace because - ;; speedbar has a whacky syntax table. - (string-match "\\([^ \t]+\\)" text) - (let ((expr (match-string 1 text)) var varnum) - (catch 'expr-found - (dolist (var1 gdb-var-list) - (when (string-equal expr (nth 1 var1)) - (setq var var1) - (setq varnum (car var1)) - (throw 'expr-found nil)))) - (unless (string-match "\\." (car var)) - (gdb-enqueue-input - (list - (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) - 'gdba) - (concat "server interpreter mi \"-var-delete " varnum "\"\n") - (concat "-var-delete " varnum "\n")) - 'ignore)) - (setq gdb-var-list (delq var gdb-var-list)) - (dolist (varchild gdb-var-list) - (if (string-match (concat (car var) "\\.") (car varchild)) - (setq gdb-var-list (delq varchild gdb-var-list))))))))) + (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list)) + (varnum (car var))) + (if (string-match "\\." (car var)) + (message-box "Can only delete a root expression") + (gdb-enqueue-input + (list + (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) + 'gdba) + (concat "server interpreter mi \"-var-delete " varnum "\"\n") + (concat "-var-delete " varnum "\n")) + 'ignore)) + (setq gdb-var-list (delq var gdb-var-list)) + (dolist (varchild gdb-var-list) + (if (string-match (concat (car var) "\\.") (car varchild)) + (setq gdb-var-list (delq varchild gdb-var-list)))))))) + +(defun gdb-var-delete-children (varnum) + "Delete children of variable object at point from the speedbar." + (gdb-enqueue-input + (list + (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba) + (concat "server interpreter mi \"-var-delete -c " varnum "\"\n") + (concat "-var-delete -c " varnum "\n")) 'ignore))) (defun gdb-edit-value (text token indent) "Assign a value to a variable displayed in the speedbar." @@ -914,6 +913,7 @@ INDENT is the current indentation depth." (dolist (var gdb-var-list) (if (string-match (concat token "\\.") (car var)) (setq gdb-var-list (delq var gdb-var-list)))) + (gdb-var-delete-children token) (speedbar-change-expand-button-char ?+) (speedbar-delete-subblock indent)) (t (error "Ooops... not sure what to do"))) @@ -1004,7 +1004,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'." 'gdb-partial-output-name) (defun gdb-partial-output-name () - (concat "*partial-output-" + (concat " *partial-output-" (gdb-get-target-string) "*")) @@ -1390,7 +1390,7 @@ sink to `user' in `gdb-stopping', that is fine." (if (and gdb-frame-begin gdb-printing) (setq gud-overlay-arrow-position gud-old-arrow) ;;Pop up GUD buffer to display current frame when it doesn't have source - ;;information i.e id not compiled with -g as with libc routines generally. + ;;information i.e if not compiled with -g as with libc routines generally. (if gdb-same-frame (gdb-display-gdb-buffer) (gdb-frame-gdb-buffer)) @@ -1404,6 +1404,7 @@ sink to `user' in `gdb-stopping', that is fine." (gdb-invalidate-frames) 'delete)))))) (unless (member gdb-inferior-status '("exited" "signal")) + (setq gdb-active-process t) ;Just for attaching case. (setq gdb-inferior-status "stopped") (gdb-force-mode-line-update (propertize gdb-inferior-status 'face font-lock-warning-face))) @@ -1774,7 +1775,7 @@ static char *magick[] = { (dolist (buffer (buffer-list)) (with-current-buffer buffer (if (and (memq gud-minor-mode '(gdba gdbmi)) - (not (string-match "\\`\\*.+\\*\\'" (buffer-name)))) + (not (string-match "\\` ?\\*.+\\*\\'" (buffer-name)))) (gdb-remove-breakpoint-icons (point-min) (point-max))))) (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer) (save-excursion @@ -2923,7 +2924,7 @@ Kills the gdb buffers, and resets variables and the source buffers." (unless (eq buffer gud-comint-buffer) (with-current-buffer buffer (if (memq gud-minor-mode '(gdbmi gdba)) - (if (string-match "\\`\\*.+\\*\\'" (buffer-name)) + (if (string-match "\\` ?\\*.+\\*\\'" (buffer-name)) (kill-buffer nil) (gdb-remove-breakpoint-icons (point-min) (point-max) t) (setq gud-minor-mode nil) diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el index 90e6fbe3df3..50d01e9d2e5 100644 --- a/lisp/progmodes/glasses.el +++ b/lisp/progmodes/glasses.el @@ -1,6 +1,7 @@ ;;; glasses.el --- make cantReadThis readable -;; Copyright (C) 1999, 2000, 2001, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Milan Zamazal <pdm@zamazal.org> diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index fc7c303c491..adc6cd5194d 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -486,7 +486,7 @@ required by the caller." (car (nth 1 var-list)))) (setq char ?-) (setq char ?+)) - (if (string-match "\\*$" type) + (if (string-match "\\*$\\|\\*&$" type) (speedbar-make-tag-line 'bracket char 'gdb-speedbar-expand-node varnum diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 1d370244523..9b812809352 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -1,7 +1,6 @@ ;;; idlw-help.el --- HTML Help code for IDLWAVE -;; Copyright (c) 2000 Carsten Dominik -;; Copyright (c) 2001, 2002 J.D. Smith -;; Copyright (c) 2003,2004,2005,2006 Free Software Foundation +;; Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation ;; ;; Authors: J.D. Smith <jdsmith@as.arizona.edu> ;; Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 6fa03c27ba1..25f05b54b74 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -427,11 +427,11 @@ t means to show all source files." :type 'integer) (defcustom idlwave-library-path nil - "Library path for Windows and MacOS (OS9). Not needed under Unix. + "Library path for Windows and MacOS (OS9). Not needed under UNIX. When selecting the directories to scan for IDL user catalog routine info, IDLWAVE can, under UNIX, query the shell for the exact search path \(the value of !PATH). However, under Windows and MacOS -(pre-OSX), the IDLWAVE shell does not work. In this case, this +\(pre-OSX), the IDLWAVE shell does not work. In this case, this variable can be set to specify the paths where IDLWAVE can find PRO files. The shell will only be asked for a list of paths when this variable is nil. The value is a list of directories. A directory @@ -1595,7 +1595,7 @@ Capitalize system variables - action only (define-key idlwave-mode-map "\C-c\C-t" 'idlwave-find-module-this-file) (define-key idlwave-mode-map "\C-c?" 'idlwave-routine-info) (define-key idlwave-mode-map "\M-?" 'idlwave-context-help) -(define-key idlwave-mode-map [(control meta ?\?)] +(define-key idlwave-mode-map [(control meta ?\?)] 'idlwave-help-assistant-help-with-topic) ;; Pickup both forms of Esc/Meta binding (define-key idlwave-mode-map [(meta tab)] 'idlwave-complete) @@ -1942,7 +1942,7 @@ The main features of this mode are (set (make-local-variable 'parse-sexp-ignore-comments) t) ;; ChangeLog - (set (make-local-variable 'add-log-current-defun-function) + (set (make-local-variable 'add-log-current-defun-function) 'idlwave-current-routine-fullname) ;; Set tag table list to use IDLTAGS as file name. @@ -4651,7 +4651,11 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.") props (car (cdr pelem))) (cond ((eq ptype 'SUPERCLASS) - (push (cdr (assq 'name props)) inherits)) + (let ((pname (cdr (assq 'name props))) + (plink (cdr (assq 'link props)))) + (unless (and (string= pname "None") + (string= plink "None")) + (push pname inherits)))) ((eq ptype 'PROPERTY) (let ((pname (cdr (assq 'name props))) @@ -9232,7 +9236,7 @@ Assumes that point is at the beginning of the unit as found by "--" ["Info" idlwave-info t] "--" - ["Help with Topic" idlwave-help-assistant-help-with-topic + ["Help with Topic" idlwave-help-assistant-help-with-topic idlwave-help-use-assistant] ["Launch IDL Help" idlwave-launch-idlhelp t]))) diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index 4f0159c5992..461c8b9bcf1 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el @@ -89,7 +89,7 @@ ;; 3.5.2 PROVIDE "PROVIDE" ;; 3.5.3 PROVIDE_HIDDEN - "PROVIDE_HIDEN" + "PROVIDE_HIDDEN" ;; 3.6 SECTIONS Command "SECTIONS" ;; 3.6.4.2 Input Section Wildcard Patterns diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 57941db9691..998b33ffbc7 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -61,37 +61,38 @@ Used in `octave-mode' and inferior-octave-mode buffers. All Octave abbrevs start with a grave accent (`).") (unless octave-abbrev-table - (let ((ac abbrevs-changed)) - (define-abbrev-table 'octave-abbrev-table ()) - (define-abbrev octave-abbrev-table "`a" "all_va_args" nil 0 t) - (define-abbrev octave-abbrev-table "`b" "break" nil 0 t) - (define-abbrev octave-abbrev-table "`cs" "case" nil 0 t) - (define-abbrev octave-abbrev-table "`ca" "catch" nil 0 t) - (define-abbrev octave-abbrev-table "`c" "continue" nil 0 t) - (define-abbrev octave-abbrev-table "`el" "else" nil 0 t) - (define-abbrev octave-abbrev-table "`eli" "elseif" nil 0 t) - (define-abbrev octave-abbrev-table "`et" "end_try_catch" nil 0 t) - (define-abbrev octave-abbrev-table "`eu" "end_unwind_protect" nil 0 t) - (define-abbrev octave-abbrev-table "`ef" "endfor" nil 0 t) - (define-abbrev octave-abbrev-table "`efu" "endfunction" nil 0 t) - (define-abbrev octave-abbrev-table "`ei" "endif" nil 0 t) - (define-abbrev octave-abbrev-table "`es" "endswitch" nil 0 t) - (define-abbrev octave-abbrev-table "`ew" "endwhile" nil 0 t) - (define-abbrev octave-abbrev-table "`f" "for" nil 0 t) - (define-abbrev octave-abbrev-table "`fu" "function" nil 0 t) - (define-abbrev octave-abbrev-table "`gl" "global" nil 0 t) - (define-abbrev octave-abbrev-table "`gp" "gplot" nil 0 t) - (define-abbrev octave-abbrev-table "`gs" "gsplot" nil 0 t) - (define-abbrev octave-abbrev-table "`if" "if ()" nil 0 t) - (define-abbrev octave-abbrev-table "`o" "otherwise" nil 0 t) - (define-abbrev octave-abbrev-table "`rp" "replot" nil 0 t) - (define-abbrev octave-abbrev-table "`r" "return" nil 0 t) - (define-abbrev octave-abbrev-table "`s" "switch" nil 0 t) - (define-abbrev octave-abbrev-table "`t" "try" nil 0 t) - (define-abbrev octave-abbrev-table "`up" "unwind_protect" nil 0 t) - (define-abbrev octave-abbrev-table "`upc" "unwind_protect_cleanup" nil 0 t) - (define-abbrev octave-abbrev-table "`w" "while ()" nil 0 t) - (setq abbrevs-changed ac))) + (define-abbrev-table 'octave-abbrev-table ())) + +(let ((ac abbrevs-changed)) + (define-abbrev octave-abbrev-table "`a" "all_va_args" nil 0 t) + (define-abbrev octave-abbrev-table "`b" "break" nil 0 t) + (define-abbrev octave-abbrev-table "`cs" "case" nil 0 t) + (define-abbrev octave-abbrev-table "`ca" "catch" nil 0 t) + (define-abbrev octave-abbrev-table "`c" "continue" nil 0 t) + (define-abbrev octave-abbrev-table "`el" "else" nil 0 t) + (define-abbrev octave-abbrev-table "`eli" "elseif" nil 0 t) + (define-abbrev octave-abbrev-table "`et" "end_try_catch" nil 0 t) + (define-abbrev octave-abbrev-table "`eu" "end_unwind_protect" nil 0 t) + (define-abbrev octave-abbrev-table "`ef" "endfor" nil 0 t) + (define-abbrev octave-abbrev-table "`efu" "endfunction" nil 0 t) + (define-abbrev octave-abbrev-table "`ei" "endif" nil 0 t) + (define-abbrev octave-abbrev-table "`es" "endswitch" nil 0 t) + (define-abbrev octave-abbrev-table "`ew" "endwhile" nil 0 t) + (define-abbrev octave-abbrev-table "`f" "for" nil 0 t) + (define-abbrev octave-abbrev-table "`fu" "function" nil 0 t) + (define-abbrev octave-abbrev-table "`gl" "global" nil 0 t) + (define-abbrev octave-abbrev-table "`gp" "gplot" nil 0 t) + (define-abbrev octave-abbrev-table "`gs" "gsplot" nil 0 t) + (define-abbrev octave-abbrev-table "`if" "if ()" nil 0 t) + (define-abbrev octave-abbrev-table "`o" "otherwise" nil 0 t) + (define-abbrev octave-abbrev-table "`rp" "replot" nil 0 t) + (define-abbrev octave-abbrev-table "`r" "return" nil 0 t) + (define-abbrev octave-abbrev-table "`s" "switch" nil 0 t) + (define-abbrev octave-abbrev-table "`t" "try" nil 0 t) + (define-abbrev octave-abbrev-table "`up" "unwind_protect" nil 0 t) + (define-abbrev octave-abbrev-table "`upc" "unwind_protect_cleanup" nil 0 t) + (define-abbrev octave-abbrev-table "`w" "while ()" nil 0 t) + (setq abbrevs-changed ac)) (defvar octave-comment-char ?# "Character to start an Octave comment.") diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 24e9f65f180..7a62cfa477c 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -408,6 +408,7 @@ The criteria are that the line isn't a comment or in string and See also `\\[python-guess-indent]'" :group 'python :type 'integer) +(put 'python-indent 'safe-local-variable 'integerp) (defcustom python-guess-indent t "Non-nil means Python mode guesses `python-indent' for the buffer." diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 83b4bdea759..636108692fd 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1,7 +1,7 @@ ;;; sh-script.el --- shell-script editing commands for Emacs -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005, -;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Version: 2.0f @@ -1890,7 +1890,7 @@ To revert all these variables to the global values, use command `sh-reset-indent-vars-to-global-values'." (interactive) (mapcar 'make-local-variable sh-var-list) - (message "Indentation variable are now local.")) + (message "Indentation variables are now local.")) (defun sh-reset-indent-vars-to-global-values () "Reset local indentation variables to the global values. diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index 891549ac2aa..4c689a79fc7 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el @@ -1,6 +1,6 @@ ;;; simula.el --- SIMULA 87 code editing commands for Emacs -;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005, 2006 +;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no> diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index ff5493de364..afc0f35f26c 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -5,7 +5,7 @@ ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Michael Mauger <mmaug@yahoo.com> -;; Version: 2.0.1 +;; Version: 2.0.2 ;; Keywords: comm languages processes ;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode @@ -30,26 +30,40 @@ ;;; Commentary: ;; Please send bug reports and bug fixes to the mailing list at -;; sql.el@gnu.org. If you want to subscribe to the mailing list, send -;; mail to sql.el-request@gnu.org with `subscribe sql.el FIRSTNAME -;; LASTNAME' in the mail body. - -;; This file provides a sql-mode and a sql-interactive-mode. My goals -;; were two simple modes providing syntactic hilighting. The -;; interactive mode had to provide a command-line history; the other -;; mode had to provide "send region/buffer to SQL interpreter" -;; functions. "simple" in this context means easy to use, easy to -;; maintain and little or no bells and whistles. +;; help-gnu-emacs@gnu.org. If you want to subscribe to the mailing +;; list, see the web page at +;; http://lists.gnu.org/mailman/listinfo/help-gnu-emacs for +;; instructions. I monitor this list actively. If you send an e-mail +;; to Alex Schroeder it usually makes it to me when Alex has a chance +;; to forward them along (Thanks, Alex). + +;; This file provides a sql-mode and a sql-interactive-mode. The +;; original goals were two simple modes providing syntactic +;; highlighting. The interactive mode had to provide a command-line +;; history; the other mode had to provide "send region/buffer to SQL +;; interpreter" functions. "simple" in this context means easy to +;; use, easy to maintain and little or no bells and whistles. This +;; has changed somewhat as experience with the mode has accumulated. + +;; Support for different flavors of SQL and command interpreters was +;; available in early versions of sql.el. This support has been +;; extended and formalized in later versions. Part of the impetus for +;; the improved support of SQL flavors was borne out of the current +;; maintainer's consulting experience. In the past fifteen years, I +;; have used Oracle, Sybase, Informix, MySQL, Postgres, and SQLServer. +;; On some assignments, I have used two or more of these concurrently. ;; If anybody feels like extending this sql mode, take a look at the ;; above mentioned modes and write a sqlx-mode on top of this one. If ;; this proves to be difficult, please suggest changes that will -;; facilitate your plans. +;; facilitate your plans. Facilities have been provided to add +;; products and product-specific configuration. ;; sql-interactive-mode is used to interact with a SQL interpreter ;; process in a SQLi buffer (usually called `*SQL*'). The SQLi buffer -;; is created by calling a SQL interpreter-specific entry function. Do -;; *not* call sql-interactive-mode by itself. +;; is created by calling a SQL interpreter-specific entry function or +;; sql-product-interactive. Do *not* call sql-interactive-mode by +;; itself. ;; The list of currently supported interpreters and the corresponding ;; entry function used to create the SQLi buffers is shown with @@ -847,23 +861,24 @@ Based on `comint-mode-map'.") (defvar sql-mode-abbrev-table nil "Abbrev table used in `sql-mode' and `sql-interactive-mode'.") (unless sql-mode-abbrev-table - (define-abbrev-table 'sql-mode-abbrev-table nil) - (mapcar - ;; In Emacs 21.3+, provide SYSTEM-FLAG to define-abbrev. - '(lambda (abbrev) - (let ((name (car abbrev)) - (expansion (cdr abbrev))) - (condition-case nil - (define-abbrev sql-mode-abbrev-table name expansion nil 0 t) - (error - (define-abbrev sql-mode-abbrev-table name expansion))))) - '(("ins" "insert") - ("upd" "update") - ("del" "delete") - ("sel" "select") - ("proc" "procedure") - ("func" "function") - ("cr" "create")))) + (define-abbrev-table 'sql-mode-abbrev-table nil)) + +(mapcar + ;; In Emacs 22+, provide SYSTEM-FLAG to define-abbrev. + '(lambda (abbrev) + (let ((name (car abbrev)) + (expansion (cdr abbrev))) + (condition-case nil + (define-abbrev sql-mode-abbrev-table name expansion nil 0 t) + (error + (define-abbrev sql-mode-abbrev-table name expansion))))) + '(("ins" . "insert") + ("upd" . "update") + ("del" . "delete") + ("sel" . "select") + ("proc" . "procedure") + ("func" . "function") + ("cr" . "create"))) ;; Syntax Table @@ -872,13 +887,15 @@ Based on `comint-mode-map'.") ;; C-style comments /**/ (see elisp manual "Syntax Flags")) (modify-syntax-entry ?/ ". 14" table) (modify-syntax-entry ?* ". 23" table) - ;; double-dash starts comment + ;; double-dash starts comments (modify-syntax-entry ?- ". 12b" table) - ;; newline and formfeed end coments + ;; newline and formfeed end comments (modify-syntax-entry ?\n "> b" table) (modify-syntax-entry ?\f "> b" table) - ;; single quotes (') quotes delimit strings + ;; single quotes (') delimit strings (modify-syntax-entry ?' "\"" table) + ;; double quotes (") don't delimit strings + (modify-syntax-entry ?\" "." table) ;; backslash is no escape character (modify-syntax-entry ?\\ "." table) table) @@ -887,12 +904,13 @@ Based on `comint-mode-map'.") ;; Font lock support (defvar sql-mode-font-lock-object-name - (list (concat "^\\s-*\\(create\\|drop\\|alter\\)\\s-+" ;; lead off with CREATE, DROP or ALTER - "\\(\\w+\\s-+\\)*" ;; optional intervening keywords - "\\(table\\|view\\|package\\(\\s-+body\\)?\\|proc\\(edure\\)?" - "\\|function\\|trigger\\|sequence\\|rule\\|default\\)\\s-+" - "\\(\\w+\\)") - 6 'font-lock-function-name-face) + (eval-when-compile + (list (concat "^\\s-*\\(?:create\\|drop\\|alter\\)\\s-+" ;; lead off with CREATE, DROP or ALTER + "\\(?:\\w+\\s-+\\)*" ;; optional intervening keywords + "\\(?:table\\|view\\|\\(?:package\\|type\\)\\(?:\\s-+body\\)?\\|proc\\(?:edure\\)?" + "\\|function\\|trigger\\|sequence\\|rule\\|default\\)\\s-+" + "\\(\\w+\\)") + 1 'font-lock-function-name-face)) "Pattern to match the names of top-level objects. diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 60c3e1c3144..3bf4227a82f 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -1,12 +1,13 @@ ;;; vhdl-mode.el --- major mode for editing VHDL code -;; Copyright (C) 1992-2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Authors: Reto Zimmermann <reto@gnu.org> ;; Rodney J. Whitby <software.vhdl-mode@rwhitby.net> ;; Maintainer: Reto Zimmermann <reto@gnu.org> ;; Keywords: languages vhdl -;; WWW: http://opensource.ethz.ch/emacs/vhdl-mode.html +;; WWW: http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html (defconst vhdl-version "3.33.6" "VHDL Mode version number.") @@ -2892,7 +2893,6 @@ STRING are replaced by `-' and substrings are converted to lower case." (defun vhdl-mode-abbrev-table-init () "Initialize `vhdl-mode-abbrev-table'." - (when vhdl-mode-abbrev-table (clear-abbrev-table vhdl-mode-abbrev-table)) (define-abbrev-table 'vhdl-mode-abbrev-table (append (when (memq 'vhdl vhdl-electric-keywords) diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el index 154566312ab..eff8ff5eae2 100644 --- a/lisp/ps-bdf.el +++ b/lisp/ps-bdf.el @@ -1,13 +1,13 @@ ;;; ps-bdf.el --- BDF font file handler for ps-print -;; Copyright (C) 1998, 1999, 2001, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1998, 1999, 2001, 2003 +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Keywords: wp, BDF, font, PostScript ;; Maintainer: Kenichi Handa <handa@m17n.org> -;; Time-stamp: <2003/07/11 21:13:44 vinicius> ;; This file is part of GNU Emacs. diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index f67b54e28dc..9c8f09cd716 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -8,7 +8,6 @@ ;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters) ;; Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Keywords: wp, print, PostScript, multibyte, mule -;; Time-stamp: <2006/11/11 16:58:10 vinicius> ;; This file is part of GNU Emacs. diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 8512c2c962c..9bc37f5451c 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -10,7 +10,6 @@ ;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters) ;; Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Keywords: wp, print, PostScript -;; Time-stamp: <2006/12/01 09:59:01 vinicius> ;; Version: 6.7 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre diff --git a/lisp/register.el b/lisp/register.el index 8dea532410c..8940a887532 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -1,6 +1,6 @@ ;;; register.el --- register commands for Emacs -;; Copyright (C) 1985, 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/repeat.el b/lisp/repeat.el index b225b729def..51e9d160a4e 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el @@ -1,6 +1,6 @@ ;;; repeat.el --- convenient way to repeat the previous command -;; Copyright (C) 1998, 2002, 2003, 2004, 2005, +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Will Mengarini <seldon@eskimo.com> diff --git a/lisp/replace.el b/lisp/replace.el index 4275aef8d87..610fd9d2e9f 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1341,7 +1341,7 @@ with the `noescape' argument set. (defun replace-match-data (integers reuse &optional new) "Like `match-data', but markers in REUSE get invalidated. -If NEW is non-NIL, it is set and returned instead of fresh data, +If NEW is non-nil, it is set and returned instead of fresh data, but coerced to the correct value of INTEGERS." (or (and new (progn @@ -1357,7 +1357,7 @@ NEWTEXT, FIXEDCASE, LITERAL are just passed on. If NOEDIT is true, no check for `\\?' is made to save time. MATCH-DATA is used for the replacement. In case editing is done, it is changed to use markers. -The return value is non-NIL if there has been no `\\?' or NOEDIT was +The return value is non-nil if there has been no `\\?' or NOEDIT was passed in. If LITERAL is set, no checking is done, anyway." (unless (or literal noedit) (setq noedit t) @@ -1486,7 +1486,7 @@ make, or the user didn't cancel the call." ;; For speed, use only integers and ;; reuse the list used last time. (replace-match-data t real-match-data))))) - + ;; Record whether the match is nonempty, to avoid an infinite loop ;; repeatedly matching the same empty string. (setq nonempty-match diff --git a/lisp/reposition.el b/lisp/reposition.el index a87b72443df..08af0dc2f20 100644 --- a/lisp/reposition.el +++ b/lisp/reposition.el @@ -1,6 +1,6 @@ ;;; reposition.el --- center a Lisp function or comment on the screen -;; Copyright (C) 1991, 1994, 2002, 2003, 2004, +;; Copyright (C) 1991, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu> diff --git a/lisp/resume.el b/lisp/resume.el index 85c1ea0231f..48cf9562b9f 100644 --- a/lisp/resume.el +++ b/lisp/resume.el @@ -1,6 +1,6 @@ ;;; resume.el --- process command line args from within a suspended Emacs job -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Joe Wells <jbw@bucsf.bu.edu> diff --git a/lisp/rot13.el b/lisp/rot13.el index 38e0d5e8180..a6605722d8a 100644 --- a/lisp/rot13.el +++ b/lisp/rot13.el @@ -1,6 +1,6 @@ ;;; rot13.el --- display a buffer in ROT13 -;; Copyright (C) 1988, 2002, 2003, 2004, 2005, +;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle diff --git a/lisp/s-region.el b/lisp/s-region.el index 6bc4b481d7b..fa01dd986a1 100644 --- a/lisp/s-region.el +++ b/lisp/s-region.el @@ -1,6 +1,6 @@ ;;; s-region.el --- set region using shift key -;; Copyright (C) 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> diff --git a/lisp/sb-image.el b/lisp/sb-image.el index c608346cd02..ac124fbc26b 100644 --- a/lisp/sb-image.el +++ b/lisp/sb-image.el @@ -1,6 +1,6 @@ ;;; sb-image --- Image management for speedbar -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el index c659768bc52..483de88fe39 100644 --- a/lisp/scroll-all.el +++ b/lisp/scroll-all.el @@ -1,6 +1,6 @@ ;;; scroll-all.el --- scroll all buffers together minor mode -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com> diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el index 4801f9e02d4..d82ac0659f0 100644 --- a/lisp/scroll-bar.el +++ b/lisp/scroll-bar.el @@ -75,6 +75,7 @@ SIDE must be the symbol `left' or `right'." ;;;; Helpful functions for enabling and disabling scroll bars. (defvar scroll-bar-mode) +(defvar previous-scroll-bar-mode nil) (defvar scroll-bar-mode-explicit nil "Non-nil means `set-scroll-bar-mode' should really do something. @@ -85,6 +86,9 @@ This is nil while loading `scroll-bar.el', and t afterward.") (defun set-scroll-bar-mode (value) "Set `scroll-bar-mode' to VALUE and put the new value into effect." + (if scroll-bar-mode + (setq previous-scroll-bar-mode scroll-bar-mode)) + (setq scroll-bar-mode value) (when scroll-bar-mode-explicit @@ -124,7 +128,8 @@ turn off scroll bars; otherwise, turn on scroll bars." (not scroll-bar-mode) (setq flag (prefix-numeric-value flag)) (or (not (numberp flag)) (>= flag 0))) - default-frame-scroll-bars))) + (or previous-scroll-bar-mode + default-frame-scroll-bars)))) (defun toggle-scroll-bar (arg) "Toggle whether or not the selected frame has vertical scroll bars. diff --git a/lisp/select.el b/lisp/select.el index 9b711ee1d7f..642d91969a6 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -3,7 +3,7 @@ ;; Maintainer: FSF ;; Keywords: internal -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Based partially on earlier release by Lucid. diff --git a/lisp/shell.el b/lisp/shell.el index d3e23251a1f..27220b54ab0 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -1,6 +1,6 @@ ;;; shell.el --- specialized comint.el for running the shell -;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, +;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, ;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> @@ -520,10 +520,10 @@ If BUFFER exists but shell process is not running, make new shell. If BUFFER exists and shell process is running, just switch to BUFFER. Program used comes from variable `explicit-shell-file-name', or (if that is nil) from the ESHELL environment variable, - or else from SHELL if there is no ESHELL. -If a file `~/.emacs_SHELLNAME' exists, it is given as initial input - (Note that this may lose due to a timing error if the shell - discards input when it starts up.) + or (if that is nil) from `shell-file-name'. +If a file `~/.emacs_SHELLNAME' exists, or `~/.emacs.d/init_SHELLNAME.sh', +it is given as initial input (but this may be lost, due to a timing +error, if the shell discards input when it starts up). The buffer is put in Shell mode, giving commands for sending input and controlling the subjobs of the shell. See `shell-mode'. See also the variable `shell-prompt-pattern'. @@ -556,8 +556,8 @@ Otherwise, one argument `-i' is passed to the shell. (name (file-name-nondirectory prog)) (startfile (concat "~/.emacs_" name)) (xargs-name (intern-soft (concat "explicit-" name "-args")))) - (if (not (file-exists-p startfile)) - (setq startfile (concat "~/.emacs.d/.emacs_" name))) + (unless (file-exists-p startfile) + (setq startfile (concat "~/.emacs.d/init_" name ".sh"))) (apply 'make-comint-in-buffer "shell" buffer prog (if (file-exists-p startfile) startfile) (if (and xargs-name (boundp xargs-name)) diff --git a/lisp/simple.el b/lisp/simple.el index 1dd6d8ba76b..a78f152cbcd 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -694,8 +694,8 @@ Leave one space or none, according to the context." (defun delete-horizontal-space (&optional backward-only) "Delete all spaces and tabs around point. -If BACKWARD-ONLY is non-nil, only delete spaces before point." - (interactive "*") +If BACKWARD-ONLY is non-nil, only delete them before point." + (interactive "*P") (let ((orig-pos (point))) (delete-region (if backward-only @@ -4321,7 +4321,7 @@ The variable `selective-display' has a separate value for each buffer." (defvaralias 'default-indicate-unused-lines 'default-indicate-empty-lines) (defun toggle-truncate-lines (&optional arg) - "Toggle whether to fold or truncate long lines on the screen. + "Toggle whether to fold or truncate long lines for the current buffer. With arg, truncate long lines iff arg is positive. Note that in side-by-side windows, truncation is always enabled." (interactive "P") diff --git a/lisp/skeleton.el b/lisp/skeleton.el index d51fd91c3b4..d903dab461d 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -1,6 +1,6 @@ ;;; skeleton.el --- Lisp language extension for writing statement skeletons -;; Copyright (C) 1993, 1994, 1995, 1996, 2002, 2003, +;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/sort.el b/lisp/sort.el index 99293d6b51b..7b90d3dcbdf 100644 --- a/lisp/sort.el +++ b/lisp/sort.el @@ -1,6 +1,6 @@ ;;; sort.el --- commands to sort text in an Emacs buffer -;; Copyright (C) 1986, 1987, 1994, 1995, 2002, 2003, +;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Howie Kaye diff --git a/lisp/soundex.el b/lisp/soundex.el index e48dbcf3bd6..be73d71c21a 100644 --- a/lisp/soundex.el +++ b/lisp/soundex.el @@ -1,6 +1,6 @@ ;;; soundex.el --- implement Soundex algorithm -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Christian Plaunt <chris@bliss.berkeley.edu> diff --git a/lisp/startup.el b/lisp/startup.el index 724329a7855..30d25900ad4 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1189,6 +1189,7 @@ Values less than twice `fancy-splash-delay' are ignored." (defvar fancy-splash-help-echo nil) (defvar fancy-splash-stop-time nil) (defvar fancy-splash-outer-buffer nil) +(defvar fancy-splash-last-input-event nil) (defun fancy-splash-insert (&rest args) "Insert text into the current buffer, with faces. @@ -1362,6 +1363,7 @@ mouse." splash-buffer (old-minor-mode-map-alist minor-mode-map-alist) (old-emulation-mode-map-alists emulation-mode-map-alists) + (old-special-event-map special-event-map) (frame (fancy-splash-frame)) timer) (save-selected-window @@ -1382,6 +1384,20 @@ mouse." (define-key map [mouse-movement] 'ignore) (define-key map [mode-line t] 'ignore) (define-key map [select-window] 'ignore) + ;; Temporarily bind special events to + ;; fancy-splash-special-event-action so as to stop + ;; displaying splash screens with such events. + ;; Otherwise, drag-n-drop into splash screens may + ;; leave us in recursive editing with invisible + ;; cursors for a while. + (setq special-event-map (make-sparse-keymap)) + (map-keymap + (lambda (key def) + (define-key special-event-map (vector key) + (if (eq def 'ignore) + 'ignore + 'fancy-splash-special-event-action))) + old-special-event-map) (setq display-hourglass nil minor-mode-map-alist nil emulation-mode-map-alists nil @@ -1398,11 +1414,18 @@ mouse." (cancel-timer timer) (setq display-hourglass old-hourglass minor-mode-map-alist old-minor-mode-map-alist - emulation-mode-map-alists old-emulation-mode-map-alists) + emulation-mode-map-alists old-emulation-mode-map-alists + special-event-map old-special-event-map) (kill-buffer splash-buffer) (when (frame-live-p frame) (select-frame frame) - (switch-to-buffer fancy-splash-outer-buffer)))))) + (switch-to-buffer fancy-splash-outer-buffer)) + (when fancy-splash-last-input-event + (setq last-input-event fancy-splash-last-input-event + fancy-splash-last-input-event nil) + (command-execute (lookup-key special-event-map + (vector last-input-event)) + nil (vector last-input-event) t)))))) ;; If hide-on-input is nil, don't hide the buffer on input. (if (or (window-minibuffer-p) (window-dedicated-p (selected-window))) @@ -1429,6 +1452,14 @@ Warning Warning!!! Pure space overflow !!!Warning Warning (view-mode-enter nil 'kill-buffer)) (goto-char (point-min))))) +(defun fancy-splash-special-event-action () + "Save the last event and stop displaying the splash screen buffer. +This is an internal function used to turn off the splash screen after +the user caused an input event that is bound in `special-event-map'" + (interactive) + (setq fancy-splash-last-input-event last-input-event) + (throw 'exit nil)) + (defun fancy-splash-frame () "Return the frame to use for the fancy splash screen. @@ -1454,9 +1485,12 @@ we put it on this frame." (if (and (display-color-p) (image-type-available-p 'xpm)) "splash.xpm" "splash.pbm")))) - (image-height (and img (cdr (image-size img)))) - (window-height (1- (window-height (frame-selected-window frame))))) - (> window-height (+ image-height 19))))))) + (image-height (and img (cdr (image-size img nil frame)))) + ;; We test frame-height so that, if the frame is split + ;; by displaying a warning, that doesn't cause the normal + ;; splash screen to be used. + (frame-height (1- (frame-height frame)))) + (> frame-height (+ image-height 19))))))) (defun normal-splash-screen (&optional hide-on-input) diff --git a/lisp/strokes.el b/lisp/strokes.el index 8d2b021ce61..c440f0df860 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el @@ -1,6 +1,6 @@ ;;; strokes.el --- control Emacs through mouse strokes -;; Copyright (C) 1997, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David Bakhash <cadet@alum.mit.edu> diff --git a/lisp/subr.el b/lisp/subr.el index 91c12fdaf9c..6f9042f50b3 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -943,7 +943,8 @@ is converted into a string by expressing it in decimal." (make-obsolete-variable 'directory-sep-char "do not use it." "21.1") (make-obsolete-variable 'mode-line-inverse-video "use the appropriate faces instead." "21.1") (make-obsolete-variable 'unread-command-char - "use `unread-command-events' instead. That variable is a list of events to reread, so it now uses nil to mean `no event', instead of -1." + "use `unread-command-events' instead. That variable is a list of events +to reread, so it now uses nil to mean `no event', instead of -1." "before 19.15") ;; Lisp manual only updated in 22.1. diff --git a/lisp/tabify.el b/lisp/tabify.el index 9dde60ba3d7..42d8e15f1ab 100644 --- a/lisp/tabify.el +++ b/lisp/tabify.el @@ -1,6 +1,6 @@ ;;; tabify.el --- tab conversion commands for Emacs -;; Copyright (C) 1985, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/talk.el b/lisp/talk.el index 8ec443b5d6e..f107086046d 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -1,6 +1,6 @@ ;;; talk.el --- allow several users to talk to each other through Emacs -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/tempo.el b/lisp/tempo.el index e65a8179518..14fdb4c969e 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -1,6 +1,6 @@ ;;; tempo.el --- Flexible template insertion -;; Copyright (C) 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David K}gedal <davidk@lysator.liu.se> diff --git a/lisp/term.el b/lisp/term.el index 77dd921b7b6..1e97a4eebcd 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1,6 +1,6 @@ ;;; term.el --- general command interpreter in a window stuff -;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2002, 2003, +;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Bothner <per@bothner.com> diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el index 2f98e7bf6fa..702a4b614e2 100644 --- a/lisp/term/AT386.el +++ b/lisp/term/AT386.el @@ -1,11 +1,11 @@ ;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*- +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. + ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Keywords: terminals -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, -;; 2006 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index 0f1d426d23c..56a387b1848 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -1,6 +1,6 @@ ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <dann@ics.uci.edu> diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 43454a5ca77..f35bf080bbb 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1,6 +1,6 @@ ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Andrew Choi <akochoi@mac.com> @@ -82,7 +82,6 @@ (defvar mac-service-selection) (defvar mac-system-script-code) (defvar mac-apple-event-map) -(defvar mac-atsu-font-table) (defvar mac-font-panel-mode) (defvar mac-ts-active-input-overlay) (defvar x-invocation-args) @@ -1791,7 +1790,8 @@ With numeric ARG, display the font panel if and only if ARG is positive." (let* ((ae (mac-event-ae event)) (fm-font-size (mac-ae-number ae "fmsz")) (atsu-font-id (mac-ae-number ae "auid")) - (attribute-values (gethash atsu-font-id mac-atsu-font-table))) + (attribute-values (and atsu-font-id + (mac-atsu-font-face-attributes atsu-font-id)))) (if fm-font-size (setq attribute-values `(:height ,(* 10 fm-font-size) ,@attribute-values))) @@ -1964,6 +1964,22 @@ the echo area or in a buffer where the cursor is not displayed." (mac-split-string-by-property-change string) "")) +(defun mac-keyboard-translate-char (ch) + (if (and (char-valid-p ch) + (or (char-table-p keyboard-translate-table) + (and (or (stringp keyboard-translate-table) + (vectorp keyboard-translate-table)) + (> (length keyboard-translate-table) ch)))) + (or (aref keyboard-translate-table ch) ch) + ch)) + +(defun mac-unread-string (string) + ;; Unread characters and insert them in a keyboard macro being + ;; defined. + (apply 'isearch-unread + (mapcar 'mac-keyboard-translate-char + (mac-replace-untranslated-utf-8-chars string)))) + (defun mac-ts-update-active-input-area (event) "Update Mac TSM active input area according to EVENT. The confirmed text is converted to Emacs input events and pushed @@ -2042,11 +2058,7 @@ either in the current buffer or in the echo area." (point) (point) (current-buffer)) (overlay-put mac-ts-active-input-overlay 'before-string active-input-string)) - ;; Unread confirmed characters and insert them in a keyboard - ;; macro being defined. - (apply 'isearch-unread - (append (mac-replace-untranslated-utf-8-chars - (funcall decode-fun confirmed coding)) '()))) + (mac-unread-string (funcall decode-fun confirmed coding))) ;; The event is successfully processed. Sync the sequence number. (setq mac-ts-update-active-input-area-seqno (1+ seqno)))) @@ -2059,11 +2071,7 @@ either in the current buffer or in the echo area." (coding (or (cdr (assq (car script-language) mac-script-code-coding-systems)) 'mac-roman))) - ;; Unread characters and insert them in a keyboard macro being - ;; defined. - (apply 'isearch-unread - (append (mac-replace-untranslated-utf-8-chars - (mac-utxt-to-string text coding)) '())))) + (mac-unread-string (mac-utxt-to-string text coding)))) ;; kEventClassTextInput/kEventTextInputUpdateActiveInputArea (define-key mac-apple-event-map [text-input update-active-input-area] @@ -2459,7 +2467,7 @@ It returns a name of the created fontset." ;; Setup the default fontset. (setup-default-fontset) -(cond ((x-list-fonts "*-iso10646-1") +(cond ((x-list-fonts "*-iso10646-1" nil nil 1) ;; Use ATSUI (if available) for the following charsets. (dolist (charset '(latin-iso8859-1 @@ -2471,7 +2479,7 @@ It returns a name of the created fontset." vietnamese-viscii-lower vietnamese-viscii-upper lao ethiopic tibetan)) (set-fontset-font nil charset '(nil . "iso10646-1")))) - ((null (x-list-fonts "*-iso8859-1")) + ((null (x-list-fonts "*-iso8859-1" nil nil 1)) ;; Add Mac-encoding fonts unless ETL fonts are installed. (fontset-add-mac-fonts "fontset-default"))) diff --git a/lisp/term/news.el b/lisp/term/news.el index 6fd39d24210..d39c79838f6 100644 --- a/lisp/term/news.el +++ b/lisp/term/news.el @@ -1,6 +1,6 @@ ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*- -;; Copyright (C) 1989, 1993, 2002, 2003, 2004, +;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el index 329e88e23e6..76b2ef6d3d9 100644 --- a/lisp/term/sun-mouse.el +++ b/lisp/term/sun-mouse.el @@ -1,6 +1,6 @@ ;;; sun-mouse.el --- mouse handling for Sun windows -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el index ebc406d8206..a038fbd3d9d 100644 --- a/lisp/term/sup-mouse.el +++ b/lisp/term/sup-mouse.el @@ -1,6 +1,6 @@ ;;; sup-mouse.el --- supdup mouse support for lisp machines -;; Copyright (C) 1985, 1986, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Wolfgang Rupprecht diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el index bcdf886638f..083c99f6241 100644 --- a/lisp/term/tvi970.el +++ b/lisp/term/tvi970.el @@ -1,11 +1,11 @@ ;;; tvi970.el --- terminal support for the Televideo 970 +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. + ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992 ;; Keywords: terminals -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, -;; 2006 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el index be1d8ee1a49..38509a471cd 100644 --- a/lisp/term/vt100.el +++ b/lisp/term/vt100.el @@ -1,6 +1,6 @@ ;;; vt100.el --- define VT100 function key sequences in function-key-map -;; Copyright (C) 1989, 1993, 2002, 2003, 2004, +;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 7aaa59d40ec..5ba5b270327 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -1,6 +1,6 @@ ;;; w32-win.el --- parse switches controlling interface with W32 window system -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallo diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el index 07de09914d1..6723ee8a07c 100644 --- a/lisp/term/wyse50.el +++ b/lisp/term/wyse50.el @@ -1,6 +1,6 @@ ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*- -;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1989, 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org>, diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index afb749f625e..32959f38e34 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -2470,6 +2470,10 @@ order until succeed.") ;; generated from FONT. (create-fontset-from-ascii-font font resolved-name "startup")))) + ;; Set scroll bar mode to right if set by X resources. Default is left. + (if (equal (x-get-resource "verticalScrollBars" "ScrollBars") "right") + (customize-set-variable 'scroll-bar-mode 'right)) + ;; Apply a geometry resource to the initial frame. Put it at the end ;; of the alist, so that anything specified on the command line takes ;; precedence. diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index fd21c77bbf9..f72c4d205d1 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -1,6 +1,6 @@ ;;; xterm.el --- define function key sequences and standard colors for xterm -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: FSF diff --git a/lisp/terminal.el b/lisp/terminal.el index 323ddcd1153..b26a2643d75 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el @@ -1,6 +1,6 @@ ;;; terminal.el --- terminal emulator for GNU Emacs -;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2002, 2003, +;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu> diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el index 1c4dacf71d8..856fe735f8e 100644 --- a/lisp/textmodes/bib-mode.el +++ b/lisp/textmodes/bib-mode.el @@ -1,6 +1,6 @@ ;;; bib-mode.el --- major mode for editing bib files -;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 9597b136d7d..5cc22443219 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -1,7 +1,7 @@ ;;; bibtex.el --- BibTeX mode for GNU Emacs -;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, -;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de> ;; Bengt Martensson <bengt@mathematik.uni-Bremen.de> diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el index cd1079e0924..841a5bb0830 100644 --- a/lisp/textmodes/enriched.el +++ b/lisp/textmodes/enriched.el @@ -1,6 +1,6 @@ ;;; enriched.el --- read and save files in text/enriched format -;; Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index e5b3a64db84..21ee585ec11 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -762,7 +762,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling." (list (if current-prefix-arg 'full)))) ;; First try fill-paragraph-function. (or (and (or fill-paragraph-function - (and (window-minibuffer-p (selected-window)) + (and (minibufferp (current-buffer)) (= 1 (point-min)))) (let ((function (or fill-paragraph-function ;; In the minibuffer, don't count the width @@ -838,14 +838,16 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'." (commark (comment-string-strip (buffer-substring comstart comin) nil t)) (comment-re - (if (string-match comment-start-skip (concat commark "a")) + ;; `commark' is surrounded with arbitrary text (`\0' and `a') + ;; to make sure it can be used as an optimization of + ;; `comment-start-skip' in the middle of a line. For example, + ;; `commark' can't be used with the "@c" in TeXinfo (hence + ;; the `a') or with the "C" at BOL in Fortran (hence the `\0'). + (if (string-match comment-start-skip (concat "\0" commark "a")) (concat "[ \t]*" (regexp-quote commark) ;; Make sure we only match comments that use ;; the exact same comment marker. "[^" (substring commark -1) "]") - ;; If the commark needs to be followed by some special - ;; set of characters (like @c in TeXinfo), we can't - ;; rely just on `commark'. (concat "[ \t]*\\(?:" comment-start-skip "\\)"))) (comment-fill-prefix ; Compute a fill prefix. (save-excursion diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index a3c110b8f19..7badf21d966 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -1,6 +1,6 @@ ;;; flyspell.el --- on-the-fly spell checker -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr> @@ -541,6 +541,11 @@ in your .emacs file. (member (or ispell-local-dictionary ispell-dictionary) flyspell-dictionaries-that-consider-dash-as-word-delimiter))))) +(defun flyspell-hack-local-variables-hook () + ;; When local variables are loaded, see if the dictionary context + ;; has changed. + (flyspell-accept-buffer-local-defs 'force)) + (defun flyspell-kill-ispell-hook () (setq flyspell-last-buffer nil) (dolist (buf (buffer-list)) @@ -579,6 +584,9 @@ in your .emacs file. (add-hook 'pre-command-hook (function flyspell-pre-command-hook) t t) ;; we bound flyspell action to after-change hook (add-hook 'after-change-functions 'flyspell-after-change-function nil t) + ;; we bound flyspell action to hack-local-variables-hook + (add-hook 'hack-local-variables-hook + (function flyspell-hack-local-variables-hook) t t) ;; set flyspell-generic-check-word-predicate based on the major mode (let ((mode-predicate (get major-mode 'flyspell-mode-predicate))) (if mode-predicate @@ -684,6 +692,8 @@ not the very same deplacement command." (remove-hook 'post-command-hook (function flyspell-post-command-hook) t) (remove-hook 'pre-command-hook (function flyspell-pre-command-hook) t) (remove-hook 'after-change-functions 'flyspell-after-change-function t) + (remove-hook 'hack-local-variables-hook + (function flyspell-hack-local-variables-hook) t) ;; we remove all the flyspell hilightings (flyspell-delete-all-overlays) ;; we have to erase pre cache variables diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el index 26a47a65e84..f521cc279d0 100644 --- a/lisp/textmodes/makeinfo.el +++ b/lisp/textmodes/makeinfo.el @@ -1,6 +1,6 @@ ;;; makeinfo.el --- run makeinfo conveniently -;; Copyright (C) 1991, 1993, 2002, 2003, 2004, +;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Robert J. Chassell diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index d9baad489a3..4cd697af36d 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <dominik at science dot uva dot nl> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/ -;; Version: 4.56b +;; Version: 4.56e ;; ;; This file is part of GNU Emacs. ;; @@ -114,7 +114,7 @@ ;;; Customization variables -(defvar org-version "4.56b" +(defvar org-version "4.56e" "The version number of the file org.el.") (defun org-version () (interactive) @@ -3211,6 +3211,9 @@ The following commands are available: ;; Paragraphs and auto-filling (org-set-autofill-regexps) (org-update-radio-target-regexp) + ;; Make isearch reveal context after success + (org-set-local 'outline-isearch-open-invisible-function + (lambda (&rest ignore) (org-show-context nil t))) (if (and org-insert-mode-line-in-empty-file (interactive-p) @@ -3238,7 +3241,7 @@ The following commands are available: (defsubst org-current-line (&optional pos) (save-excursion (and pos (goto-char pos)) - (+ (if (bolp) 1 0) (count-lines (point-min) (point))))) + (+ (if (bolp) 1 0) (count-lines 1 (point))))) (defun org-current-time () "Current time, possibly rounded to `org-time-stamp-rounding-minutes'." @@ -5691,6 +5694,7 @@ When SIBLINGS is non-nil, show all siblings on each hierarchy level." (save-excursion (and (if heading-p (org-goto-sibling) (outline-next-heading)) (org-flag-heading nil)))) + (when siblings (org-show-siblings)) (when hierarchy-p ;; show all higher headings, possibly with siblings (save-excursion @@ -5699,12 +5703,15 @@ When SIBLINGS is non-nil, show all siblings on each hierarchy level." (error nil)) (not (bobp))) (org-flag-heading nil) - (when siblings - (save-excursion - (while (org-goto-sibling) (org-flag-heading nil))) - (save-excursion - (while (org-goto-sibling 'previous) - (org-flag-heading nil)))))))))) + (when siblings (org-show-siblings)))))))) + +(defun org-show-siblings () + "Show all siblings of the current headline." + (save-excursion + (while (org-goto-sibling) (org-flag-heading nil))) + (save-excursion + (while (org-goto-sibling 'previous) + (org-flag-heading nil)))) (defun org-reveal (&optional siblings) "Show current entry, hierarchy above it, and the following headline. @@ -12375,11 +12382,11 @@ with `org-table-paste-rectangle'." (rpl (if cut " " nil))) (goto-char beg) (org-table-check-inside-data-field) - (setq l01 (count-lines (point-min) (point)) + (setq l01 (org-current-line) c01 (org-table-current-column)) (goto-char end) (org-table-check-inside-data-field) - (setq l02 (count-lines (point-min) (point)) + (setq l02 (org-current-line) c02 (org-table-current-column)) (setq l1 (min l01 l02) l2 (max l01 l02) c1 (min c01 c02) c2 (max c01 c02)) @@ -12410,7 +12417,7 @@ lines." (error "First cut/copy a region to paste!")) (org-table-check-inside-data-field) (let* ((clip org-table-clip) - (line (count-lines (point-min) (point))) + (line (org-current-line)) (col (org-table-current-column)) (org-enable-table-editor t) (org-table-automatic-realign nil) @@ -16278,6 +16285,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]." (define-key org-mode-map [(tab)] 'org-cycle) (define-key org-mode-map [(control tab)] 'org-force-cycle-archived) (define-key org-mode-map [(meta tab)] 'org-complete) +(define-key org-mode-map "\M-\t" 'org-complete) ;; The following line is necessary under Suse GNU/Linux (unless (featurep 'xemacs) (define-key org-mode-map [S-iso-lefttab] 'org-shifttab)) diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index 24282872f67..700a4388f57 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -1,6 +1,6 @@ ;;; page-ext.el --- extended page handling commands -;; Copyright (C) 1990, 1991, 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Robert J. Chassell <bob@gnu.org> diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el index 20458491808..f3abe36a26e 100644 --- a/lisp/textmodes/page.el +++ b/lisp/textmodes/page.el @@ -1,6 +1,6 @@ ;;; page.el --- page motion commands for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index ce1dbf8993b..ab070053e07 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -1,6 +1,6 @@ ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model -;; Copyright (C) 1985, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index 25613cff8ca..f276fe26458 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -1,6 +1,6 @@ ;;; refbib.el --- convert refer-style references to ones usable by Latex bib -;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Henry Kautz <kautz@research.att.com> diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el index ce0f96956df..474b6f7be60 100644 --- a/lisp/textmodes/refer.el +++ b/lisp/textmodes/refer.el @@ -79,19 +79,19 @@ :group 'wp) (defcustom refer-bib-directory nil - "Directory, or list of directories, to search for \\.bib files. Can -be set to 'bibinputs or 'texinputs, in which case the environment + "Directory, or list of directories, to search for \\.bib files. +Can be set to 'bibinputs or 'texinputs, in which case the environment variable BIBINPUTS or TEXINPUTS, respectively, is used to obtain a -list of directories. Useful only if refer-bib-files is set to 'dir or -a list of file names (without directory). A value of nil indicates the +list of directories. Useful only if `refer-bib-files' is set to 'dir or +a list of file names (without directory). A value of nil indicates the current working directory. -If refer-bib-directory is 'bibinputs or 'texinputs, it is setq'd to +If `refer-bib-directory' is 'bibinputs or 'texinputs, it is setq'd to the appropriate list of directories when it is first used. Note that an empty directory is interpreted by BibTeX as indicating -the default search path. Since Refer does not know that default path, -it cannot search it. Include that path explicitly in your BIBINPUTS +the default search path. Since Refer does not know that default path, +it cannot search it. Include that path explicitly in your BIBINPUTS environment if you really want it searched (which is not likely to happen anyway)." :type '(choice (repeat directory) (const bibinputs) (const texinputs)) @@ -102,24 +102,24 @@ happen anyway)." or one of the following special values: nil = prompt for \\.bib file (if visiting a \\.bib file, use it as default) auto = read \\.bib file names from appropriate command in buffer (see - refer-bib-files-regexp) unless the buffer's mode is bibtex-mode, + `refer-bib-files-regexp') unless the buffer's mode is `bibtex-mode', in which case only the buffer is searched -dir = use all \\.bib files in directories referenced by refer-bib-directory. +dir = use all \\.bib files in directories referenced by `refer-bib-directory'. If a specified file doesn't exist and has no extension, a \\.bib extension is automatically tried. -If refer-bib-files is nil, auto or dir, it is setq'd to the appropriate -list of files when it is first used if refer-cache-bib-files is t. If -refer-cache-bib-files is nil, the list of \\.bib files to use is re-read +If `refer-bib-files' is nil, auto or dir, it is setq'd to the appropriate +list of files when it is first used if `refer-cache-bib-files' is t. If +`refer-cache-bib-files' is nil, the list of \\.bib files to use is re-read each time it is needed." :type '(choice (repeat file) (const nil) (const auto) (const dir)) :group 'refer) (defcustom refer-cache-bib-files t - "*Variable determining whether the value of refer-bib-files should be cached. + "*Variable determining whether the value of `refer-bib-files' should be cached. If t, initialize the value of refer-bib-files the first time it is used. If -nil, re-read the list of \\.bib files depending on the value of refer-bib-files +nil, re-read the list of \\.bib files depending on the value of `refer-bib-files' each time it is needed." :type 'boolean :group 'refer) @@ -128,8 +128,8 @@ each time it is needed." "*Regexp matching a bibliography file declaration. The current buffer is expected to contain a line such as \\bibliography{file1,file2,file3} -which is read to set up refer-bib-files. The regexp must specify the command -(such as \\bibliography) that is used to specify the list of bib files. The +which is read to set up `refer-bib-files'. The regexp must specify the command +\(such as \\bibliography) that is used to specify the list of bib files. The command is expected to specify a file name, or a list of comma-separated file names, within curly braces. If a specified file doesn't exist and has no extension, a \\.bib extension @@ -150,8 +150,8 @@ is automatically tried." (defun refer-find-entry (keywords &optional continue) "Find entry in refer-bib-files containing KEYWORDS. If KEYWORDS is nil, prompt user for blank-separated list of keywords. -If CONTINUE is t, or if called interactively with a prefix arg, look for next -entry by continuing search from previous point." +If CONTINUE is non-nil, or if called interactively with a prefix arg, +look for next entry by continuing search from previous point." (interactive (list nil current-prefix-arg)) (or keywords (setq keywords (if continue refer-previous-keywords @@ -160,13 +160,13 @@ entry by continuing search from previous point." (refer-find-entry-internal keywords continue)) (defun refer-find-next-entry () - "Find next occurrence of entry in refer-bib-files. See refer-find-entry." + "Find next occurrence of entry in `refer-bib-files'. See `refer-find-entry'." (interactive) (refer-find-entry-internal refer-previous-keywords t)) (defun refer-yank-key () "Inserts at point in current buffer the \"key\" field of the entry -found on the last refer-find-entry or refer-find-next-entry." +found on the last `refer-find-entry' or `refer-find-next-entry'." (interactive) (let ((old-point (point))) (insert diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el index 28ecd3bb4fe..69eb96491d1 100644 --- a/lisp/textmodes/refill.el +++ b/lisp/textmodes/refill.el @@ -1,6 +1,6 @@ ;;; refill.el --- `auto-fill' by refilling paragraphs on changes -;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 394a0b52b19..aa46553adbe 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -1,5 +1,6 @@ ;;; reftex-auc.el --- RefTeX's interface to AUCTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index a83c790f076..55d1e2f4614 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el @@ -1,5 +1,6 @@ ;;; reftex-cite.el --- creating citations with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 1e60b8e663e..bc5f7691bb7 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -1,5 +1,6 @@ ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index b878c288735..b07627c2e95 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -1,5 +1,6 @@ ;;; reftex-global.el --- operations on entire documents with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index 5616d4f454c..15f70895ce3 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1,5 +1,6 @@ ;;; reftex-index.el --- index support with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 76eb7c31df8..89aef5bd971 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -1,5 +1,6 @@ ;;; reftex-parse.el --- parser functions for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index a850da3042e..3104152dab6 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -1,5 +1,6 @@ ;;; reftex-ref.el --- code to create labels and references with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index f0e8205024c..1660fe70f40 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -1,5 +1,6 @@ ;;; reftex-sel.el --- the selection modes for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2440, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 0f8a948e363..852af59df45 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -1,5 +1,6 @@ ;;; reftex-vars.el --- configuration variables for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 6136d22e432..aa24a724877 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -265,7 +265,10 @@ Any terminating `>' or `/' is not matched.") (1 (if (match-end 2) sgml-namespace-face font-lock-function-name-face)) (2 font-lock-function-name-face nil t)) ;; FIXME: this doesn't cover the variables using a default value. - (,(concat "\\(" sgml-namespace-re "\\)\\(?::\\(" + ;; The first shy-group is an important anchor: it prevents an O(n^2) + ;; pathological case where we otherwise keep retrying a failing match + ;; against a very long word at every possible position within the word. + (,(concat "\\(?:^\\|[ \t]\\)\\(" sgml-namespace-re "\\)\\(?::\\(" sgml-name-re "\\)\\)?=[\"']") (1 (if (match-end 2) sgml-namespace-face font-lock-variable-name-face)) (2 font-lock-variable-name-face nil t)) diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el index ddc6788123d..f68cc6b6010 100644 --- a/lisp/textmodes/spell.el +++ b/lisp/textmodes/spell.el @@ -1,6 +1,6 @@ ;;; spell.el --- spelling correction interface for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 9e78f4b6015..511721d7f67 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,7 +1,7 @@ ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*- ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: tex diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 9263c48f18b..873635a3893 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -1,6 +1,6 @@ ;;; text-mode.el --- text mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1992, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1992, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index bf6edac230c..74b2db3ad34 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -1,6 +1,6 @@ ;;; tildify.el --- adding hard spaces into texts -;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 958ef179b26..9de1a078d13 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -1,6 +1,6 @@ ;;; two-column.el --- minor mode for editing of two-column text -;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el index 8e8ef3b399e..4cea84c5a40 100644 --- a/lisp/textmodes/underline.el +++ b/lisp/textmodes/underline.el @@ -1,6 +1,6 @@ ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index ee58fffce34..8526cfb717b 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -1,7 +1,7 @@ ;;; thingatpt.el --- get the `thing' at point -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000 -;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz> ;; Maintainer: FSF diff --git a/lisp/timezone.el b/lisp/timezone.el index 2529f7da865..af30cf64988 100644 --- a/lisp/timezone.el +++ b/lisp/timezone.el @@ -1,6 +1,6 @@ ;;; timezone.el --- time zone package for GNU Emacs -;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2002, 2003, +;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu Umeda diff --git a/lisp/tutorial.el b/lisp/tutorial.el index b171ee9a07b..be50d793f0f 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -33,21 +33,11 @@ ;;; Code: (require 'help-mode) ;; for function help-buffer -(eval-when-compile (require 'cl)) (defface tutorial-warning-face - '((((class color) (min-colors 88) (background light)) - (:foreground "Red1" :weight bold)) - (((class color) (min-colors 88) (background dark)) - (:foreground "Pink" :weight bold)) - (((class color) (min-colors 16) (background light)) - (:foreground "Red1" :weight bold)) - (((class color) (min-colors 16) (background dark)) - (:foreground "Pink" :weight bold)) - (((class color) (min-colors 8)) (:foreground "red")) - (t (:inverse-video t :weight bold))) + '((t :inherit font-lock-warning-face)) "Face used to highlight warnings in the tutorial." - :group 'font-lock-faces) + :group 'help) (defvar tutorial--point-before-chkeys 0 "Point before display of key changes.") @@ -168,8 +158,7 @@ options: where " to get the function `" (format "%s" db) - "'.")) - ) + "'."))) (fill-region (point-min) (point))))) (print-help-return-message)))) @@ -213,110 +202,83 @@ LEFT and RIGHT are the elements to compare." ((and (symbolp cx) (symbolp cy)) (string< (symbol-name cy) - (symbol-name cx))) - )))) + (symbol-name cx))))))) (defconst tutorial--default-keys - (let* ( - ;; On window system suspend Emacs is replaced in the - ;; default keymap so honor this here. - (suspend-emacs (if window-system + ;; On window system, `suspend-emacs' is replaced in the default + ;; keymap + (let* ((suspend-emacs (if window-system 'iconify-or-deiconify-frame 'suspend-emacs)) (default-keys - `( - ;; These are not mentioned but are basic: - (ESC-prefix [27]) + `((ESC-prefix [27]) (Control-X-prefix [?\C-x]) (mode-specific-command-prefix [?\C-c]) - (save-buffers-kill-emacs [?\C-x ?\C-c]) - ;; * SUMMARY (scroll-up [?\C-v]) (scroll-down [?\M-v]) (recenter [?\C-l]) - ;; * BASIC CURSOR CONTROL (forward-char [?\C-f]) (backward-char [?\C-b]) - (forward-word [?\M-f]) (backward-word [?\M-b]) - (next-line [?\C-n]) (previous-line [?\C-p]) - (move-beginning-of-line [?\C-a]) (move-end-of-line [?\C-e]) - (backward-sentence [?\M-a]) (forward-sentence [?\M-e]) - (newline "\r") - (beginning-of-buffer [?\M-<]) (end-of-buffer [?\M->]) - (universal-argument [?\C-u]) - ;; * WHEN EMACS IS HUNG (keyboard-quit [?\C-g]) - ;; * DISABLED COMMANDS (downcase-region [?\C-x ?\C-l]) - ;; * WINDOWS (delete-other-windows [?\C-x ?1]) ;; C-u 0 C-l ;; Type CONTROL-h k CONTROL-f. - ;; * INSERTING AND DELETING ;; C-u 8 * to insert ********. - (delete-backward-char [backspace]) (delete-backward-char "\d") (delete-char [?\C-d]) - (backward-kill-word [(meta backspace)]) (kill-word [?\M-d]) - (kill-line [?\C-k]) (kill-sentence [?\M-k]) - (set-mark-command [?\C-@]) (set-mark-command [?\C- ]) (kill-region [?\C-w]) (yank [?\C-y]) (yank-pop [?\M-y]) - ;; * UNDO (advertised-undo [?\C-x ?u]) (advertised-undo [?\C-x ?u]) - ;; * FILES (find-file [?\C-x ?\C-f]) (save-buffer [?\C-x ?\C-s]) - ;; * BUFFERS (list-buffers [?\C-x ?\C-b]) (switch-to-buffer [?\C-x ?b]) (save-some-buffers [?\C-x ?s]) - ;; * EXTENDING THE COMMAND SET ;; C-x Character eXtend. Followed by one character. (execute-extended-command [?\M-x]) - ;; C-x C-f Find file ;; C-x C-s Save file ;; C-x s Save some buffers @@ -326,44 +288,35 @@ LEFT and RIGHT are the elements to compare." ;; C-x 1 Delete all but one window ;; C-x u Undo - ;; * MODE LINE (describe-mode [?\C-h ?m]) - (set-fill-column [?\C-x ?f]) (fill-paragraph [?\M-q]) - ;; * SEARCHING (isearch-forward [?\C-s]) (isearch-backward [?\C-r]) - ;; * MULTIPLE WINDOWS (split-window-vertically [?\C-x ?2]) (scroll-other-window [?\C-\M-v]) (other-window [?\C-x ?o]) (find-file-other-window [?\C-x ?4 ?\C-f]) - ;; * RECURSIVE EDITING LEVELS (keyboard-escape-quit [27 27 27]) - ;; * GETTING MORE HELP ;; The most basic HELP feature is C-h c (describe-key-briefly [?\C-h ?c]) (describe-key [?\C-h ?k]) - ;; * MORE FEATURES ;; F10 - ;; * CONCLUSION ;;(iconify-or-deiconify-frame [?\C-z]) - (,suspend-emacs [?\C-z]) - ))) + (,suspend-emacs [?\C-z])))) (sort default-keys 'tutorial--sort-keys)) "Default Emacs key bindings that the tutorial depends on.") @@ -374,7 +327,6 @@ LEFT and RIGHT are the elements to compare." (interactive-p)) (with-current-buffer (help-buffer) (let* ((tutorial-buffer (button-get button 'tutorial-buffer)) - ;;(tutorial-arg (button-get button 'tutorial-arg)) (explain-key-desc (button-get button 'explain-key-desc)) (changed-keys (with-current-buffer tutorial-buffer (save-excursion @@ -384,7 +336,7 @@ LEFT and RIGHT are the elements to compare." (when changed-keys (insert "The following key bindings used in the tutorial had been changed -from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) +from the Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) (let ((frm " %-9s %-27s %-11s %s\n")) (insert (format frm "Key" "Standard Binding" "Is Now On" "Remark"))) (dolist (tk changed-keys) @@ -405,7 +357,7 @@ from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) (insert " " key-txt " ") (setq tot-len (length key-txt)) (when (> 9 tot-len) - (insert (make-string (- 9 tot-len) ? )) + (insert (make-string (- 9 tot-len) ?\s)) (setq tot-len 9)) ;; Insert a link describing the old binding: (insert-button def-fun-txt @@ -417,7 +369,7 @@ from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) 'follow-link t) (setq tot-len (+ tot-len (length def-fun-txt))) (when (> 36 tot-len) - (insert (make-string (- 36 tot-len) ? ))) + (insert (make-string (- 36 tot-len) ?\s))) (when (listp where) (setq where "list")) ;; Tell where the old binding is now: @@ -438,29 +390,18 @@ from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) (insert "\n"))))) (insert " -It is legitimate to change key bindings, but changed bindings do not -correspond to what the tutorial says. (See also " ) - (insert-button "Key Binding Conventions" - 'action - (lambda(button) (interactive) - (info - "(elisp) Key Binding Conventions") - (message "Type C-x 0 to close the new window")) - 'follow-link t) - (insert ".)\n\n") +It is OK to change key bindings, but changed bindings do not +correspond to what the tutorial says.\n\n") (print-help-return-message))))) (defun tutorial--find-changed-keys (default-keys) - "Find the key bindings that have changed. -Check if the default Emacs key bindings that the tutorial depends -on have been changed. + "Find the key bindings used in the tutorial that have changed. +Return a list with elements of the form -Return a list with the keys that have been changed. The element -of this list have the following format: + '(KEY DEF-FUN DEF-FUN-TXT WHERE REMARK QUIET) - \(list KEY DEF-FUN DEF-FUN-TXT WHERE REMARK) +where -Where KEY is a key sequence whose standard binding has been changed DEF-FUN is the standard binding of KEY DEF-FUN-TXT is a short descriptive text for DEF-FUN @@ -477,9 +418,10 @@ Where rest of the list is used to show information when the user clicks the link. - KEY-FUN is the actual binding for KEY." + KEY-FUN is the actual binding for KEY. + QUIET is t if this changed keybinding should be handled quietly. + This is used by `tutorial--display-changes'." (let (changed-keys remark) - ;; (default-keys tutorial--default-keys)) (dolist (kdf default-keys) ;; The variables below corresponds to those with the same names ;; described in the doc string. @@ -518,26 +460,21 @@ Where (setq remark (list "cua-mode, more info" 'cua-mode)) nil) ((and cua-mode - (or - (and (eq def-fun 'ESC-prefix) - (equal key-fun + (or (and (eq def-fun 'ESC-prefix) + (equal key-fun `(keymap - (118 . cua-repeat-replace-region)))) - (and (eq def-fun 'mode-specific-command-prefix) - (equal key-fun - '(keymap - (timeout . copy-region-as-kill)))) - (and (eq def-fun 'Control-X-prefix) - (equal key-fun - '(keymap (timeout . kill-region)))))) + (118 . cua-repeat-replace-region))) + (setq def-fun-txt "\"ESC prefix\"")) + (and (eq def-fun 'mode-specific-command-prefix) + (equal key-fun + '(keymap + (timeout . copy-region-as-kill))) + (setq def-fun-txt "\"C-c prefix\"")) + (and (eq def-fun 'Control-X-prefix) + (equal key-fun + '(keymap (timeout . kill-region))) + (setq def-fun-txt "\"C-x prefix\"")))) (setq remark (list "cua-mode replacement" 'cua-mode)) - (cond - ((eq def-fun 'mode-specific-command-prefix) - (setq def-fun-txt "\"C-c prefix\"")) - ((eq def-fun 'Control-X-prefix) - (setq def-fun-txt "\"C-x prefix\"")) - ((eq def-fun 'ESC-prefix) - (setq def-fun-txt "\"ESC prefix\""))) (setq where "Same key") nil) ;; viper-mode specials: @@ -567,124 +504,110 @@ Where key-fun def-fun key where)) nil)) (add-to-list 'changed-keys - (list key def-fun def-fun-txt where remark))))) + (list key def-fun def-fun-txt where remark nil))))) changed-keys)) -(defvar tutorial--tab-map - (let ((map (make-sparse-keymap))) - (define-key map [tab] 'forward-button) - (define-key map [(shift tab)] 'backward-button) - (define-key map [(meta tab)] 'backward-button) - map) - "Keymap that allows tabbing between buttons.") +(defun tutorial--key-description (key) + (let ((desc (key-description key))) + (cond ((string= "ESC" desc) "<ESC>") + ((string= "RET" desc) "<Return>") + ((string= "DEL" desc) "<Delback>") + (t desc)))) -(defun tutorial--display-changes (changed-keys) +(defun tutorial--display-changes () "Display changes to some default key bindings. If some of the default key bindings that the tutorial depends on have been changed then display the changes in the tutorial buffer -with some explanatory links. - -CHANGED-KEYS should be a list in the format returned by -`tutorial--find-changed-keys'." - (when (or changed-keys - (boundp 'viper-mode-string)) +with some explanatory links." + (let* ((changed-keys (tutorial--find-changed-keys + tutorial--default-keys)) + ;; Alist of element (DESC . CK) where DESC is the + ;; key-description of a changed key and CK is the + ;; corresponding element in `changed-keys'. + (changed-keys-alist + (mapcar (lambda (ck) (cons (tutorial--key-description (car ck)) ck)) + changed-keys)) + changed-key + (start (point)) + (case-fold-search nil) + (keybindings-regexp + (concat "[[:space:]]\\(" + (mapconcat (lambda (kdf) (regexp-quote + (tutorial--key-description + (nth 1 kdf)))) + tutorial--default-keys + "\\|") + "\\)[[:punct:][:space:]]"))) ;; Need the custom button face for viper buttons: - (when (boundp 'viper-mode-string) - (require 'cus-edit)) - (let ((start (point)) - end - (head (get-lang-string tutorial--lang 'tut-chgdhead)) - (head2 (get-lang-string tutorial--lang 'tut-chgdhead2))) - (when (and head head2) - (goto-char tutorial--point-before-chkeys) - (insert head) - (insert-button head2 - 'tutorial-buffer - (current-buffer) - ;;'tutorial-arg arg - 'action - 'tutorial--detailed-help - 'follow-link t - 'face 'link) - (insert "]\n\n" ) - (when changed-keys - (dolist (tk changed-keys) - (let* ((def-fun (nth 1 tk)) - (key (nth 0 tk)) - (def-fun-txt (nth 2 tk)) - (where (nth 3 tk)) - (remark (nth 4 tk)) - (rem-fun (command-remapping def-fun)) - (key-txt (key-description key)) - (key-fun (key-binding key)) - tot-len) - (unless (eq def-fun key-fun) - ;; Mark the key in the tutorial text - (unless (string= "Same key" where) - (let ((here (point)) - (case-fold-search nil) - (key-desc (key-description key))) - (cond ((string= "ESC" key-desc) - (setq key-desc "<ESC>")) - ((string= "RET" key-desc) - (setq key-desc "<Return>")) - ((string= "DEL" key-desc) - (setq key-desc "<Delback>"))) - (while (re-search-forward - (concat "[[:space:]]\\(" - (regexp-quote key-desc) - "\\)[[:space:]]") nil t) - (put-text-property (match-beginning 1) - (match-end 1) - 'tutorial-remark 'only-colored) - (put-text-property (match-beginning 1) - (match-end 1) - 'face 'tutorial-warning-face) - (forward-line) - (let ((s (get-lang-string tutorial--lang 'tut-chgdkey)) - (s2 (get-lang-string tutorial--lang 'tut-chgdkey2)) - (start (point)) - end) - (when (and s s2) - (setq s (format s key-desc where s2)) - (insert s) - (insert-button s2 - 'tutorial-buffer - (current-buffer) - ;;'tutorial-arg arg - 'action - 'tutorial--detailed-help - 'explain-key-desc key-desc - 'follow-link t - 'face 'link) - (insert "] **") - (insert "\n") - (setq end (point)) - (put-text-property start end 'local-map tutorial--tab-map) - ;; Add a property so we can remove the remark: - (put-text-property start end 'tutorial-remark t) - (put-text-property start end - 'face 'tutorial-warning-face) - (put-text-property start end 'read-only t)))) - (goto-char here))))))) - - - (setq end (point)) - ;; Make the area with information about change key - ;; bindings stand out: - (put-text-property start end 'tutorial-remark t) - (put-text-property start end - 'face 'tutorial-warning-face) - ;; Make it possible to use Tab/S-Tab between fields in - ;; this area: - (put-text-property start end 'local-map tutorial--tab-map) - (setq tutorial--point-after-chkeys (point-marker)) - ;; Make this area read-only: - (put-text-property start end 'read-only t))))) + (if (boundp 'viper-mode-string) (require 'cus-edit)) + + (if (or changed-keys (boundp 'viper-mode-string)) + (let ((head (get-lang-string tutorial--lang 'tut-chgdhead)) + (head2 (get-lang-string tutorial--lang 'tut-chgdhead2))) + (when (and head head2) + (goto-char tutorial--point-before-chkeys) + (insert head " [") + (insert-button head2 'tutorial-buffer (current-buffer) + 'action 'tutorial--detailed-help + 'follow-link t 'face 'link) + (insert "]\n\n") + (add-text-properties tutorial--point-before-chkeys (point) + '(tutorial-remark remark + face tutorial-warning-face + read-only t))))) + + ;; Scan the tutorial for all key sequences. + (goto-char (point-min)) + (while (re-search-forward keybindings-regexp (point-max) t) + ;; Then highlight each rebound key sequence. + ;; This avoids issuing a warning for, e.g., C-x C-b if C-b is rebound. + (setq changed-key (assoc (match-string 1) changed-keys-alist)) + (and changed-key + (not (get-text-property (match-beginning 1) 'tutorial-remark)) + (let* ((desc (car changed-key)) + (ck (cdr changed-key)) + (key (nth 0 ck)) + (def-fun (nth 1 ck)) + (where (nth 3 ck)) + s1 s2 help-string) + (unless (string= where "Same key") + (setq tutorial--point-after-chkeys (point-marker) + s1 (get-lang-string tutorial--lang 'tut-chgdkey) + s2 (get-lang-string tutorial--lang 'tut-chgdkey2) + help-string (and s1 s2 (format s1 desc where))) + (add-text-properties (match-beginning 1) (match-end 1) + '(face tutorial-warning-face + tutorial-remark key-sequence)) + (if help-string + (if (nth 5 ck) + ;; Put help string in the tooltip. + (put-text-property (match-beginning 1) (match-end 1) + 'help-echo help-string) + ;; Put help string in the buffer. + (save-excursion + (setcar (nthcdr 5 ck) t) + (forward-line) + ;; Two or more changed keys were on the same line. + (while (eq (get-text-property (point) 'tutorial-remark) + 'remark) + (forward-line)) + (setq start (point)) + (insert "** " help-string " [") + (insert-button s2 'tutorial-buffer (current-buffer) + 'action 'tutorial--detailed-help + 'explain-key-desc desc 'follow-link t + 'face 'link) + (insert "] **\n") + (add-text-properties start (point) + '(tutorial-remark remark + rear-nonsticky t + face tutorial-warning-face + read-only t))))))))))) (defun tutorial--saved-dir () - "Directory where to save tutorials." - (expand-file-name ".emacstut" "~/")) + "Directory to which tutorials are saved." + (expand-file-name "tutorial" + (if (eq system-type 'ms-dos) "~/_emacs.d/" "~/.emacs.d/"))) (defun tutorial--saved-file () "File name in which to save tutorials." @@ -711,11 +634,8 @@ CHANGED-KEYS should be a list in the format returned by (unless prop-end (setq prop-end (point-max))) (goto-char prop-end) - (if (eq prop-val 'only-colored) - (put-text-property prop-start prop-end 'face '(:background nil)) - (let ((orig-text (get-text-property prop-start 'tutorial-orig))) - (delete-region prop-start prop-end) - (when orig-text (insert orig-text)))))))) + (unless (eq prop-val 'key-sequence) + (delete-region prop-start prop-end)))))) (defun tutorial--save-tutorial () "Save the tutorial buffer. @@ -724,9 +644,10 @@ showing changed keys. It also saves the point position and the position where the display of changed bindings was inserted." ;; This runs in a hook so protect it: (condition-case err - (tutorial--save-tutorial-to (tutorial--saved-file)) - (error (message "Error saving tutorial state: %s" (error-message-string err)) - (sit-for 4)))) + (if (y-or-n-p "Save your position in the tutorial? ") + (tutorial--save-tutorial-to (tutorial--saved-file))) + (error (message "Error saving tutorial state: %s" + (error-message-string err))))) (defun tutorial--save-tutorial-to (saved-file) "Save the tutorial buffer to SAVED-FILE. @@ -908,13 +829,7 @@ Run the Viper tutorial? ")) (forward-line) (setq tutorial--point-before-chkeys (point-marker))) - - ;; Check if there are key bindings that may disturb the - ;; tutorial. If so tell the user. - (let ((changed-keys (tutorial--find-changed-keys tutorial--default-keys))) - (when changed-keys - (tutorial--display-changes changed-keys))) - + (tutorial--display-changes) ;; Clear message: (unless dont-ask-for-revert @@ -971,22 +886,17 @@ Run the Viper tutorial? ")) ;; are currently only used in the tutorial. (defconst lang-strings - '( - ("English" . - ( - (tut-chgdkey . "** The key %s has been rebound, but you can use %s instead [") - (tut-chgdkey2 . "More information") + '(("English" . + ((tut-chgdkey . "%s has been rebound, but you can use %s instead") + (tut-chgdkey2 . "More") (tut-chgdhead . " NOTICE: The main purpose of the Emacs tutorial is to teach you the most important standard Emacs commands (key bindings). However, your Emacs has been customized by changing some of these basic editing commands, so it doesn't correspond to the tutorial. We have inserted colored notices where the altered - commands have been introduced. [") - (tut-chgdhead2 . "Details") - ) - ) - ) + commands have been introduced.") + (tut-chgdhead2 . "More")))) "Language specific strings for Emacs. This is an association list with the keys equal to the strings that can be returned by `read-language-name'. The elements in diff --git a/lisp/type-break.el b/lisp/type-break.el index beb7e6f3725..ae18d2eeba4 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -1,6 +1,6 @@ ;;; type-break.el --- encourage rests from typing at appropriate intervals -;; Copyright (C) 1994, 1995, 1997, 2000, 2002, 2003, +;; Copyright (C) 1994, 1995, 1997, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index c50dcf52897..c4a22bd314e 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,19 @@ +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * url-gw.el (url-gateway-nslookup-program): Doc fix. + +2006-12-08 Magnus Henoch <mange@freemail.hu> + + * url-proxy.el (url-proxy-object): New variable. + (url-proxy): Bind it instead of `proxy-object'. + + * url-http.el (url-http-create-request): Remove url argument, use + the buffer-local variable `url-http-target-url' instead. Both + callers updated. Simplify proxy handling. + (url-http): Don't make proxy-object buffer local. + + * url.el (url-retrieve-internal): Bind url-proxy-object to nil. + 2006-11-26 Magnus Henoch <mange@freemail.hu> * url-http.el (url-http-wait-for-headers-change-function): Use @@ -1730,9 +1746,14 @@ * Initial checkin of rewritten URL library. -Local variables: -coding: utf-8 -add-log-time-zone-rule: t -End: +;; Local variables: +;; coding: utf-8 +;; add-log-time-zone-rule: t +;; End: + + Copyright (C) 1999, 2001, 2002, 2004, 2005, + 2006 Free Software Foundation, Inc. + Copying and distribution of this file, with or without modification, + are permitted provided the copyright notice and this notice are preserved. ;; arch-tag: ac117078-3091-4533-be93-098162ac2926 diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el index 5197d894aa2..eaf654e2b4f 100644 --- a/lisp/url/url-gw.el +++ b/lisp/url/url-gw.el @@ -104,7 +104,7 @@ linked Emacs under SunOS 4.x" :group 'url-gateway) (defcustom url-gateway-nslookup-program "nslookup" - "*If non-NIL then a string naming nslookup program." + "*If non-nil then a string naming nslookup program." :type '(choice (const :tag "None" :value nil) string) :group 'url-gateway) @@ -253,7 +253,7 @@ Might do a non-blocking connection; use `process-status' to check." ;; Use non-blocking socket if we can. (make-network-process :name name :buffer buffer :host host :service service - :nowait + :nowait (featurep 'make-network-process '(:nowait t)))) (socks (socks-open-network-stream name buffer host service)) diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index ad556c30a07..309be690408 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -149,31 +149,32 @@ request.") (concat " (" (or url-system-type url-os-type) ")")) (t ""))))) -(defun url-http-create-request (url &optional ref-url) - "Create an HTTP request for URL, referred to by REF-URL." - (declare (special proxy-object proxy-info +(defun url-http-create-request (&optional ref-url) + "Create an HTTP request for `url-http-target-url', referred to by REF-URL." + (declare (special proxy-info url-http-method url-http-data url-http-extra-headers)) + (url-http-debug "url-proxy-object is %s\n" url-proxy-object) (let* ((extra-headers) (request nil) (no-cache (cdr-safe (assoc "Pragma" url-http-extra-headers))) - (proxy-obj (and (boundp 'proxy-object) proxy-object)) + (using-proxy (not (eq url-current-object url-http-target-url))) (proxy-auth (if (or (cdr-safe (assoc "Proxy-Authorization" url-http-extra-headers)) - (not proxy-obj)) + (not using-proxy)) nil (let ((url-basic-auth-storage 'url-http-proxy-basic-auth-storage)) - (url-get-authentication url nil 'any nil)))) - (real-fname (concat (url-filename (or proxy-obj url)) - (url-recreate-url-attributes (or proxy-obj url)))) - (host (url-host (or proxy-obj url))) + (url-get-authentication url-http-target-url nil 'any nil)))) + (real-fname (concat (url-filename url-http-target-url) + (url-recreate-url-attributes url-http-target-url))) + (host (url-host url-http-target-url)) (auth (if (cdr-safe (assoc "Authorization" url-http-extra-headers)) nil (url-get-authentication (or (and (boundp 'proxy-info) proxy-info) - url) nil 'any nil)))) + url-http-target-url) nil 'any nil)))) (if (equal "" real-fname) (setq real-fname "/")) (setq no-cache (and no-cache (string-match "no-cache" no-cache))) @@ -222,12 +223,12 @@ request.") (list ;; The request (or url-http-method "GET") " " - (if proxy-obj (url-recreate-url proxy-obj) real-fname) + (if using-proxy (url-recreate-url url-http-target-url) real-fname) " HTTP/" url-http-version "\r\n" ;; Version of MIME we speak "MIME-Version: 1.0\r\n" ;; (maybe) Try to keep the connection open - "Connection: " (if (or proxy-obj + "Connection: " (if (or using-proxy (not url-http-attempt-keepalives)) "close" "keep-alive") "\r\n" ;; HTTP extensions we support @@ -235,11 +236,11 @@ request.") (format "Extension: %s\r\n" url-extensions-header)) ;; Who we want to talk to - (if (/= (url-port (or proxy-obj url)) + (if (/= (url-port url-http-target-url) (url-scheme-get-property - (url-type (or proxy-obj url)) 'default-port)) + (url-type url-http-target-url) 'default-port)) (format - "Host: %s:%d\r\n" host (url-port (or proxy-obj url))) + "Host: %s:%d\r\n" host (url-port url-http-target-url)) (format "Host: %s\r\n" host)) ;; Who its from (if url-personal-mail-address @@ -266,11 +267,11 @@ request.") auth ;; Cookies (url-cookie-generate-header-lines host real-fname - (equal "https" (url-type url))) + (equal "https" (url-type url-http-target-url))) ;; If-modified-since (if (and (not no-cache) (member url-http-method '("GET" nil))) - (let ((tm (url-is-cached (or proxy-obj url)))) + (let ((tm (url-is-cached url-http-target-url))) (if tm (concat "If-modified-since: " (url-get-normalized-date tm) "\r\n")))) @@ -1085,8 +1086,7 @@ CBARGS as the arguments." url-http-chunked-length url-http-chunked-start url-http-chunked-counter - url-http-process - proxy-object)) + url-http-process)) (let ((connection (url-http-find-free-connection (url-host url) (url-port url))) (buffer (generate-new-buffer (format " *http %s:%d*" @@ -1122,7 +1122,6 @@ CBARGS as the arguments." url-http-data url-http-target-url)) (set (make-local-variable var) nil)) - (make-local-variable 'proxy-object) (setq url-http-method (or url-request-method "GET") url-http-extra-headers url-request-extra-headers @@ -1134,9 +1133,8 @@ CBARGS as the arguments." url-callback-function callback url-callback-arguments cbargs url-http-after-change-function 'url-http-wait-for-headers-change-function - url-http-target-url (if (boundp 'proxy-object) - proxy-object - url-current-object)) + url-http-target-url (or url-proxy-object + url-current-object)) (set-process-buffer connection buffer) (set-process-filter connection 'url-http-generic-filter) @@ -1151,7 +1149,7 @@ CBARGS as the arguments." (url-port url))) (t (set-process-sentinel connection 'url-http-end-of-document-sentinel) - (process-send-string connection (url-http-create-request url))))))) + (process-send-string connection (url-http-create-request))))))) buffer)) (defun url-http-async-sentinel (proc why) @@ -1162,7 +1160,7 @@ CBARGS as the arguments." (cond ((string= (substring why 0 4) "open") (set-process-sentinel proc 'url-http-end-of-document-sentinel) - (process-send-string proc (url-http-create-request url-http-target-url))) + (process-send-string proc (url-http-create-request))) (t (setf (car url-callback-arguments) (nconc (list :error (list 'error 'connection-failed why diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el index c3bfb1e0c4b..5374030587b 100644 --- a/lisp/url/url-proxy.el +++ b/lisp/url/url-proxy.el @@ -65,12 +65,18 @@ (url-warn 'url (format "Unknown proxy directive: %s" proxy) 'critical) nil)))) +(defvar url-proxy-object nil + "The URL to access through a proxy. +This variable is bound by `url-proxy'. If this is non-nil, the +scheme-specific loader should use its argument as the proxy, and +the value of this variable as the object to retrieve.") + (defun url-proxy (url callback &optional cbargs) ;; Retrieve URL from a proxy. ;; Expects `url-using-proxy' to be bound to the specific proxy to use." (setq url-using-proxy (url-generic-parse-url url-using-proxy)) - (let ((proxy-object (copy-sequence url))) - (url-set-target proxy-object nil) + (let ((url-proxy-object (copy-sequence url))) + (url-set-target url-proxy-object nil) (url-http url-using-proxy callback cbargs))) (provide 'url-proxy) diff --git a/lisp/url/url.el b/lisp/url/url.el index a95c7e39c02..4ba604203dc 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -172,6 +172,7 @@ the list of events, as described in the docstring of `url-retrieve'." (unless (url-type url) (error "Bad url: %s" (url-recreate-url url))) (let ((loader (url-scheme-get-property (url-type url) 'loader)) + (url-proxy-object nil) (url-using-proxy (if (url-host url) (url-find-proxy-for-url url (url-host url)))) (buffer nil) diff --git a/lisp/userlock.el b/lisp/userlock.el index 3be854b5aa6..bf35e92933c 100644 --- a/lisp/userlock.el +++ b/lisp/userlock.el @@ -1,6 +1,6 @@ ;;; userlock.el --- handle file access contention between multiple users -;; Copyright (C) 1985, 1986, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index a0fc8af8345..bac6c26cc93 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -406,6 +406,20 @@ Return non-nil if FILE is unchanged." (defun vc-arch-init-version () nil) +;;; Less obvious implementations. + +(defun vc-arch-find-version (file rev buffer) + (let ((out (make-temp-file "vc-out"))) + (unwind-protect + (progn + (with-temp-buffer + (vc-arch-command (current-buffer) 1 nil "file-diffs" file rev) + (call-process-region (point-min) (point-max) + "patch" nil nil nil "-R" "-o" out file)) + (with-current-buffer buffer + (insert-file-contents out))) + (delete-file out)))) + (provide 'vc-arch) ;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704 diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 8b9973acab1..7aae75c8a76 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -1,7 +1,7 @@ ;;; vc-hooks.el --- resident support for version-control -;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002, -;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> @@ -625,9 +625,10 @@ the user should be returned; if REGEXP is non-nil that means to return a regexp for matching all such backup files, regardless of the version." (if regexp (concat (regexp-quote (file-name-nondirectory file)) - "\\.~[0-9.]+" (unless manual "\\.") "~") + "\\.~.+" (unless manual "\\.") "~") (expand-file-name (concat (file-name-nondirectory file) - ".~" (or rev (vc-workfile-version file)) + ".~" (subst-char-in-string + ?/ ?_ (or rev (vc-workfile-version file))) (unless manual ".") "~") (file-name-directory file)))) diff --git a/lisp/vcursor.el b/lisp/vcursor.el index a9d3fd68d74..22b1d0fdd76 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -1,6 +1,6 @@ ;;; vcursor.el --- manipulate an alternative ("virtual") cursor -;; Copyright (C) 1994, 1996, 1998, 2002, 2003, +;; Copyright (C) 1994, 1996, 1998, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Peter Stephenson <pws@ibmth.df.unipi.it> diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el index eb365c3b580..5c65dd13976 100644 --- a/lisp/vms-patch.el +++ b/lisp/vms-patch.el @@ -1,6 +1,6 @@ ;;; vms-patch.el --- override parts of files.el for VMS -;; Copyright (C) 1986, 1992, 2002, 2003, 2004, +;; Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el index 40e7f468aaf..84ec1e2b93a 100644 --- a/lisp/vmsproc.el +++ b/lisp/vmsproc.el @@ -1,6 +1,6 @@ ;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs -;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Mukesh Prasad diff --git a/lisp/vt-control.el b/lisp/vt-control.el index d5bc90044b1..bc16a260b29 100644 --- a/lisp/vt-control.el +++ b/lisp/vt-control.el @@ -1,6 +1,6 @@ ;;; vt-control.el --- Common VTxxx control functions -;; Copyright (C) 1993, 1994, 2002, 2003, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el index 06862182ee4..caf27f55b42 100644 --- a/lisp/vt100-led.el +++ b/lisp/vt100-led.el @@ -1,6 +1,6 @@ ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones -;; Copyright (C) 1988, 2002, 2003, 2004, 2005, +;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 072606d97da..e73aa0d696d 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -240,28 +240,28 @@ On Windows and DOS, replace invalid characters. On DOS, make sure to obey the 8.3 limitations. On Windows, turn Cygwin names into native names, and also turn slashes into backslashes if the shell requires it (see `w32-shell-dos-semantics')." - (let ((name - (save-match-data - (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename) + (save-match-data + (let ((name + (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename) (replace-match "\\1:/" t nil filename) - (copy-sequence filename)))) - (start 0)) - ;; leave ':' if part of drive specifier - (if (and (> (length name) 1) - (eq (aref name 1) ?:)) - (setq start 2)) - ;; destructively replace invalid filename characters with ! - (while (string-match "[?*:<>|\"\000-\037]" name start) - (aset name (match-beginning 0) ?!) - (setq start (match-end 0))) - ;; convert directory separators to Windows format - ;; (but only if the shell in use requires it) - (when (w32-shell-dos-semantics) - (setq start 0) - (while (string-match "/" name start) - (aset name (match-beginning 0) ?\\) - (setq start (match-end 0)))) - name)) + (copy-sequence filename))) + (start 0)) + ;; leave ':' if part of drive specifier + (if (and (> (length name) 1) + (eq (aref name 1) ?:)) + (setq start 2)) + ;; destructively replace invalid filename characters with ! + (while (string-match "[?*:<>|\"\000-\037]" name start) + (aset name (match-beginning 0) ?!) + (setq start (match-end 0))) + ;; convert directory separators to Windows format + ;; (but only if the shell in use requires it) + (when (w32-shell-dos-semantics) + (setq start 0) + (while (string-match "/" name start) + (aset name (match-beginning 0) ?\\) + (setq start (match-end 0)))) + name))) ;;; Fix interface to (X-specific) mouse.el (defun x-set-selection (type data) @@ -469,5 +469,19 @@ that Emacs is unable to cope with." (expand-file-name (pop command-line-args-left)))) (batch-update-autoloads))) +(defun w32-append-code-lines (orig extra) + "Append non-empty non-comment lines in the file EXTRA to the file ORIG. + +This function saves all buffers and kills the Emacs session, without asking +for any permissions. + +This is required because the Windows build environment is not required +to include Sed, which is used by leim/Makefile.in to do the job." + (find-file orig) + (goto-char (point-max)) + (insert-file-contents extra) + (delete-matching-lines "^$\\|^;") + (save-buffers-kill-emacs t)) + ;;; arch-tag: c49b48cc-0f4f-454f-a274-c2dc34815e14 ;;; w32-fns.el ends here diff --git a/lisp/wdired.el b/lisp/wdired.el index bc70e0ddcfd..5a925e5d031 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -283,10 +283,13 @@ or \\[wdired-abort-changes] to abort changes"))) (when (and filename (not (member (file-name-nondirectory filename) '("." "..")))) (dired-move-to-filename) - (put-text-property (- (point) 2) (1- (point)) 'old-name filename) - (put-text-property b-protection (1- (point)) 'read-only t) - (setq b-protection (dired-move-to-end-of-filename t))) - (put-text-property (point) (1+ (point)) 'end-name t) + ;; The rear-nonsticky property below shall ensure that text preceding + ;; the filename can't be modified. + (add-text-properties + (1- (point)) (point) `(old-name ,filename rear-nonsticky (read-only))) + (put-text-property b-protection (point) 'read-only t) + (setq b-protection (dired-move-to-end-of-filename t)) + (put-text-property (point) (1+ (point)) 'end-name t)) (forward-line)) (put-text-property b-protection (point-max) 'read-only t)))) @@ -312,20 +315,21 @@ relies on WDired buffer's properties. Optional arg NO-DIR with value non-nil means don't include directory. Optional arg OLD with value non-nil means return old filename." ;; FIXME: Use dired-get-filename's new properties. - (let* ((end (line-end-position)) - (beg (next-single-property-change - (line-beginning-position) 'old-name nil end))) - (unless (eq beg end) - (let ((file - (if old - (get-text-property beg 'old-name) - (wdired-normalize-filename - (buffer-substring-no-properties - (+ 2 beg) (next-single-property-change (1+ beg) 'end-name)))))) - (if (or no-dir old) - file - (and file (> (length file) 0) - (concat (dired-current-directory) file))))))) + (let (beg end file) + (save-excursion + (setq end (line-end-position)) + (beginning-of-line) + (setq beg (next-single-property-change (point) 'old-name nil end)) + (unless (eq beg end) + (if old + (setq file (get-text-property beg 'old-name)) + (setq end (next-single-property-change (1+ beg) 'end-name)) + (setq file (buffer-substring-no-properties (1+ beg) end))) + (and file (setq file (wdired-normalize-filename file)))) + (if (or no-dir old) + file + (and file (> (length file) 0) + (concat (dired-current-directory) file)))))) (defun wdired-change-to-dired-mode () @@ -333,9 +337,9 @@ non-nil means return old filename." (or (eq major-mode 'wdired-mode) (error "Not a Wdired buffer")) (let ((inhibit-read-only t)) - (remove-text-properties (point-min) (point-max) - '(read-only nil local-map nil))) - (put-text-property 1 2 'front-sticky nil) + (remove-text-properties + (point-min) (point-max) + '(front-sticky nil rear-nonsticky nil read-only nil keymap nil))) (use-local-map dired-mode-map) (force-mode-line-update) (setq buffer-read-only t) @@ -368,46 +372,42 @@ non-nil means return old filename." (errors 0) file-ori file-new tmp-value) (save-excursion - (if (and wdired-allow-to-redirect-links - (fboundp 'make-symbolic-link)) - (progn - (setq tmp-value (wdired-do-symlink-changes)) - (setq errors (cdr tmp-value)) - (setq changes (car tmp-value)))) - (if (and wdired-allow-to-change-permissions - (boundp 'wdired-col-perm)) ; could have been changed - (progn - (setq tmp-value (wdired-do-perm-changes)) - (setq errors (+ errors (cdr tmp-value))) - (setq changes (or changes (car tmp-value))))) + (when (and wdired-allow-to-redirect-links + (fboundp 'make-symbolic-link)) + (setq tmp-value (wdired-do-symlink-changes)) + (setq errors (cdr tmp-value)) + (setq changes (car tmp-value))) + (when (and wdired-allow-to-change-permissions + (boundp 'wdired-col-perm)) ; could have been changed + (setq tmp-value (wdired-do-perm-changes)) + (setq errors (+ errors (cdr tmp-value))) + (setq changes (or changes (car tmp-value)))) (goto-char (point-max)) (while (not (bobp)) (setq file-ori (wdired-get-filename nil t)) - (if file-ori - (setq file-new (wdired-get-filename))) - (if (and file-ori (not (equal file-new file-ori))) - (progn - (setq changes t) - (if (not file-new) ;empty filename! - (setq files-deleted (cons file-ori files-deleted)) - (progn - (setq file-new (substitute-in-file-name file-new)) - (if wdired-use-interactive-rename - (wdired-search-and-rename file-ori file-new) - ;; If dired-rename-file autoloads dired-aux while - ;; dired-backup-overwrite is locally bound, - ;; dired-backup-overwrite won't be initialized. - ;; So we must ensure dired-aux is loaded. - (require 'dired-aux) - (condition-case err - (let ((dired-backup-overwrite nil)) - (dired-rename-file file-ori file-new - overwrite)) - (error - (setq errors (1+ errors)) - (dired-log (concat "Rename `" file-ori "' to `" - file-new "' failed:\n%s\n") - err)))))))) + (when file-ori + (setq file-new (wdired-get-filename))) + (when (and file-ori (not (equal file-new file-ori))) + (setq changes t) + (if (not file-new) ;empty filename! + (setq files-deleted (cons file-ori files-deleted)) + (setq file-new (substitute-in-file-name file-new)) + (if wdired-use-interactive-rename + (wdired-search-and-rename file-ori file-new) + ;; If dired-rename-file autoloads dired-aux while + ;; dired-backup-overwrite is locally bound, + ;; dired-backup-overwrite won't be initialized. + ;; So we must ensure dired-aux is loaded. + (require 'dired-aux) + (condition-case err + (let ((dired-backup-overwrite nil)) + (dired-rename-file file-ori file-new + overwrite)) + (error + (setq errors (1+ errors)) + (dired-log (concat "Rename `" file-ori "' to `" + file-new "' failed:\n%s\n") + err)))))) (forward-line -1))) (if changes (revert-buffer) ;The "revert" is necessary to re-sort the buffer @@ -417,10 +417,10 @@ non-nil means return old filename." end-link nil end-perm nil old-perm nil perm-changed nil)) (message "(No changes to be performed)"))) - (if files-deleted - (wdired-flag-for-deletion files-deleted)) - (if (> errors 0) - (dired-log-summary (format "%d rename actions failed" errors) nil))) + (when files-deleted + (wdired-flag-for-deletion files-deleted)) + (when (> errors 0) + (dired-log-summary (format "%d rename actions failed" errors) nil))) (set-buffer-modified-p nil) (setq buffer-undo-list nil)) @@ -446,10 +446,9 @@ non-nil means return old filename." (dired-do-create-files-regexp (function dired-rename-file) "Move" 1 ".*" filename-new nil t)) - (progn - (forward-line -1) - (beginning-of-line) - (setq exit-while (= 1 (point))))))))) + (forward-line -1) + (beginning-of-line) + (setq exit-while (bobp))))))) ;; marks a list of files for deletion (defun wdired-flag-for-deletion (filenames-ori) @@ -518,7 +517,10 @@ says how many lines to move; default is one line." (1- (match-beginning 1)) 'old-link (match-string-no-properties 1)) (put-text-property (match-end 1) (1+ (match-end 1)) 'end-link t) - (put-text-property (1- (match-beginning 1)) + (put-text-property (1- (match-beginning 1)) + (match-beginning 1) + 'rear-nonsticky '(read-only)) + (put-text-property (match-beginning 1) (match-end 1) 'read-only nil))) (forward-line) (beginning-of-line))))) @@ -527,15 +529,17 @@ says how many lines to move; default is one line." (defun wdired-get-previous-link (&optional old move) "Return the next symlink target. If OLD, return the old target. If MOVE, move point before it." - (let ((beg (previous-single-property-change (point) 'old-link nil))) - (when beg - (let ((target - (if old - (get-text-property (1- beg) 'old-link) - (buffer-substring-no-properties - (1+ beg) (next-single-property-change beg 'end-link))))) - (if move (goto-char (1- beg))) - (and target (wdired-normalize-filename target)))))) + (let (beg end target) + (setq beg (previous-single-property-change (point) 'old-link nil)) + (if beg + (progn + (if old + (setq target (get-text-property (1- beg) 'old-link)) + (setq end (next-single-property-change beg 'end-link)) + (setq target (buffer-substring-no-properties (1+ beg) end))) + (if move (goto-char (1- beg))))) + (and target (wdired-normalize-filename target)))) + ;; Perform the changes in the target of the changed links. (defun wdired-do-symlink-changes () @@ -613,29 +617,34 @@ Like original function but it skips read-only words." (define-key map [down-mouse-1] 'wdired-mouse-toggle-bit) map)) -;; Put a local-map to the permission bits of the files, and store the +;; Put a keymap property to the permission bits of the files, and store the ;; original name and permissions as a property (defun wdired-preprocess-perms () - (let ((inhibit-read-only t) - filename) + (let ((inhibit-read-only t)) (set (make-local-variable 'wdired-col-perm) nil) (save-excursion (goto-char (point-min)) (while (not (eobp)) - (if (and (not (looking-at dired-re-sym)) - (setq filename (wdired-get-filename))) - (progn - (re-search-forward dired-re-perms) - (or wdired-col-perm - (setq wdired-col-perm (- (current-column) 9))) - (if (eq wdired-allow-to-change-permissions 'advanced) - (put-text-property (match-beginning 0) (match-end 0) - 'read-only nil) - (put-text-property (1+ (match-beginning 0)) (match-end 0) - 'keymap wdired-perm-mode-map)) - (put-text-property (match-end 0) (1+ (match-end 0)) 'end-perm t) - (put-text-property (match-beginning 0) (1+ (match-beginning 0)) - 'old-perm (match-string-no-properties 0)))) + (when (and (not (looking-at dired-re-sym)) + (wdired-get-filename) + (re-search-forward dired-re-perms (line-end-position) 'eol)) + (let ((begin (match-beginning 0)) + (end (match-end 0))) + (unless wdired-col-perm + (setq wdired-col-perm (- (current-column) 9))) + (if (eq wdired-allow-to-change-permissions 'advanced) + (progn + (put-text-property begin end 'read-only nil) + ;; make first permission bit writable + (put-text-property + (1- begin) begin 'rear-nonsticky '(read-only))) + ;; avoid that keymap applies to text following permissions + (add-text-properties + (1+ begin) end + `(keymap ,wdired-perm-mode-map rear-nonsticky (keymap)))) + (put-text-property end (1+ end) 'end-perm t) + (put-text-property + begin (1+ begin) 'old-perm (match-string-no-properties 0)))) (forward-line) (beginning-of-line))))) @@ -661,24 +670,27 @@ Like original function but it skips read-only words." (put-text-property 0 1 'read-only t new-bit) (insert new-bit) (delete-char 1) - (put-text-property pos-prop (1- pos-prop) 'perm-changed t)) + (put-text-property (1- pos-prop) pos-prop 'perm-changed t) + (put-text-property (1- (point)) (point) 'rear-nonsticky '(keymap))) (forward-char 1))) (defun wdired-toggle-bit () "Toggle the permission bit at point." (interactive) (let ((inhibit-read-only t) - (new-bit (cond - ((not (eq (char-after (point)) ?-)) "-") - ((= (% (- (current-column) wdired-col-perm) 3) 0) "r") - ((= (% (- (current-column) wdired-col-perm) 3) 1) "w") - (t "x"))) + (new-bit "-") (pos-prop (- (point) (- (current-column) wdired-col-perm)))) + (if (eq (char-after (point)) ?-) + (setq new-bit + (if (= (% (- (current-column) wdired-col-perm) 3) 0) "r" + (if (= (% (- (current-column) wdired-col-perm) 3) 1) "w" + "x")))) (put-text-property 0 1 'keymap wdired-perm-mode-map new-bit) (put-text-property 0 1 'read-only t new-bit) (insert new-bit) (delete-char 1) - (put-text-property pos-prop (1- pos-prop) 'perm-changed t))) + (put-text-property (1- pos-prop) pos-prop 'perm-changed t) + (put-text-property (1- (point)) (point) 'rear-nonsticky '(keymap)))) (defun wdired-mouse-toggle-bit (event) "Toggle the permission bit that was left clicked." @@ -690,28 +702,23 @@ Like original function but it skips read-only words." ;; Allowed chars for 2000 bit are Ssl in position 6 ;; Allowed chars for 1000 bit are Tt in position 9 (defun wdired-perms-to-number (perms) - (+ - (if (= (elt perms 1) ?-) 0 400) - (if (= (elt perms 2) ?-) 0 200) - (case (elt perms 3) - (?- 0) - (?S 4000) - (?s 4100) - (t 100)) - (if (= (elt perms 4) ?-) 0 40) - (if (= (elt perms 5) ?-) 0 20) - (case (elt perms 6) - (?- 0) - (?S 2000) - (?s 2010) - (t 10)) - (if (= (elt perms 7) ?-) 0 4) - (if (= (elt perms 8) ?-) 0 2) - (case (elt perms 9) - (?- 0) - (?T 1000) - (?t 1001) - (t 1)))) + (let ((nperm 0777)) + (if (= (elt perms 1) ?-) (setq nperm (- nperm 400))) + (if (= (elt perms 2) ?-) (setq nperm (- nperm 200))) + (let ((p-bit (elt perms 3))) + (if (memq p-bit '(?- ?S)) (setq nperm (- nperm 100))) + (if (memq p-bit '(?s ?S)) (setq nperm (+ nperm 4000)))) + (if (= (elt perms 4) ?-) (setq nperm (- nperm 40))) + (if (= (elt perms 5) ?-) (setq nperm (- nperm 20))) + (let ((p-bit (elt perms 6))) + (if (memq p-bit '(?- ?S ?l)) (setq nperm (- nperm 10))) + (if (memq p-bit '(?s ?S ?l)) (setq nperm (+ nperm 2000)))) + (if (= (elt perms 7) ?-) (setq nperm (- nperm 4))) + (if (= (elt perms 8) ?-) (setq nperm (- nperm 2))) + (let ((p-bit (elt perms 9))) + (if (memq p-bit '(?- ?T)) (setq nperm (- nperm 1))) + (if (memq p-bit '(?t ?T)) (setq nperm (+ nperm 1000)))) + nperm)) ;; Perform the changes in the permissions of the files that have ;; changed. diff --git a/lisp/whitespace.el b/lisp/whitespace.el index cdb743c1494..a5ae328f500 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -1,6 +1,6 @@ ;;; whitespace.el --- warn about and clean bogus whitespaces in the file -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rajesh Vaidheeswarran <rv@gnu.org> @@ -571,7 +571,7 @@ See `whitespace-buffer' docstring for a summary of the problems." ;; Call this recursively till everything is taken care of (if whitespace-any - (whitespace-cleanup-internal) + (whitespace-cleanup-internal region-only) ;; if we are done, talk to the user (progn (unless whitespace-silent diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el index 887f6553592..4d0520dc4fd 100644 --- a/lisp/wid-browse.el +++ b/lisp/wid-browse.el @@ -1,6 +1,6 @@ ;;; wid-browse.el --- functions for browsing widgets ;; -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/widget.el b/lisp/widget.el index 6acfdfd48d8..5d828373314 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -1,6 +1,6 @@ ;;; widget.el --- a library of user interface components ;; -;; Copyright (C) 1996, 1997, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/windmove.el b/lisp/windmove.el index 3b62437e280..5c7ebfd74ea 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -1,6 +1,6 @@ ;;; windmove.el --- directional window-selection routines ;; -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Hovav Shacham (hovav@cs.stanford.edu) diff --git a/lisp/woman.el b/lisp/woman.el index b25a93d86a8..2d3513f0097 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1,6 +1,6 @@ ;;; woman.el --- browse UN*X manual pages `wo (without) man' -;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk> @@ -2102,6 +2102,18 @@ No external programs are used." (interactive) ; mainly for testing (WoMan-log-begin) (run-hooks 'woman-pre-format-hook) + + ;; look for macro sets that woman cannot handle: + (goto-char (point-min)) + (let ((case-fold-search nil)) + (unless (and (re-search-forward "^\\.SH[ \n]" (point-max) t) + (progn (goto-char (point-min)) + (re-search-forward "^\\.TH[ \n]" (point-max) t)) + (progn (goto-char (point-min)) + (not (re-search-forward "^\\.\\([pnil]p\\|sh\\)[ \n]" + (point-max) t)))) + (error "WoMan can only format manpages written in the an format"))) + (and (boundp 'font-lock-mode) font-lock-mode (font-lock-mode -1)) ;; (fundamental-mode) (let ((start-time (current-time)) ; (HIGH LOW MICROSEC) |