Commit 5f85994a authored by Miles Bader's avatar Miles Bader
Browse files

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

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-52
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-53
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-54
   Update from CVS: lisp/cus-start.el (all): Add `undo-outer-limit'.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-55
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-57
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-58
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-7
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
   Update from CVS
parents 87795686 aba1948a
......@@ -4,9 +4,6 @@ Tasks needed before the next release.
** Face remapping.
** Make Rmail find the best version of movemail.
To be done by Sergey Poznyakoff <gray@Mirddin.farlep.net>.
** Make VC-over-Tramp work where possible, or at least fail
gracefully if something isn't supported over Tramp.
To be done by Andre Spiegel <spiegel@gnu.org>.
......@@ -14,6 +11,8 @@ To be done by Andre Spiegel <spiegel@gnu.org>.
** define-minor-mode should not put :require into defcustom.
See msg from rms to emacs-devel on 21 Dec.
** Update Speedbar.
* FATAL ERRORS
** Investigate face cache related crash.
......@@ -184,7 +183,7 @@ man/anti.texi
man/basic.texi "Luc Teirlinck"
man/buffers.texi "Luc Teirlinck"
man/building.texi "Ted Zlatanov" <tzz@lifelogs.com>
man/calendar.texi
man/calendar.texi Joakim Verona <joakim@verona.se>
man/cmdargs.texi
man/commands.texi "Luc Teirlinck"
man/custom.texi
......
2005-01-29 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-info-breakpoints-custom)
(gdb-goto-breakpoint): Make breakpoint handling work on template
functions in C++. Reported by Martin Reed <mjreed@essex.ac.uk>
2005-01-28 Eli Zaretskii <eliz@gnu.org>
* descr-text.el: Add more keywords.
2005-01-27 Stefan Monnier <monnier@iro.umontreal.ca>
* speedbar.el: Avoid unnecessary use of locate-library.
* international/mule-cmds.el (standard-display-european-internal):
Don't fiddle with latin-1 non-break space any more since it's now
special cased in the C code.
Don't "do&undo" setting for 160 (especially, don't undo incorrectly).
2005-01-26 Luc Teirlinck <teirllm@auburn.edu>
* cus-start.el (all): Add `undo-outer-limit'.
2005-01-25 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
* textmodes/bibtex.el (bibtex-format-entry):
Use `bibtex-empty-field-re' only on the text of fields, not on entire
field lines.
(bibtex-autofill-entry): Use `bibtex-empty-field-re' on a string,
not on part of a buffer.
2005-01-25 Lute Kamstra <lute@gnu.org>
* textmodes/bibtex.el (bibtex-empty-field-re): Don't match
nonempty field text strings like "{letters\\macro{}more letters}".
Clarify docstring.
(bibtex-sort-entry-class, bibtex-autokey-titleword-ignore)
(bibtex-entry-offset, bibtex-parse-association)
(bibtex-parse-field-name): Fix typos in docstrings.
(bibtex-field-list, bibtex-find-crossref): Fix typos in error messages.
2005-01-24 Carsten Dominik <dominik@science.uva.nl>
* textmodes/reftex-global.el (reftex-isearch-push-state-function)
(reftex-isearch-pop-state-function, reftex-isearch-isearch-search)
(reftex-isearch-switch-to-next-file, reftex-isearch-turn-off)
(reftex-isearch-turn-on, reftex-isearch-minor-mode): New functions.
* textmodes/reftex.el (reftex-mode-menu): Add entry for reftex
isearch minor mode.
2005-01-24 Luc Teirlinck <teirllm@auburn.edu>
* help-at-pt.el (help-at-pt-display-when-idle): Add autoload cookie.
2005-01-24 Lute Kamstra <lute@gnu.org>
* textmodes/ispell.el (ispell-dictionary-alist-4): Rewrite the
CASECHARS and NOT-CASECHARS regular expressions of the
"nederlands" and "nederlands8" dictionaries to prevent a "Range
striding over charsets" error.
2005-01-24 Jay Belanger <belanger@truman.edu>
 
* calc/calc-store.el (calc-declare-variable): Use calc-var-name to
......@@ -76,7 +138,7 @@
 
2005-01-20 Steven Tamm <steventamm@mac.com>
 
* term/mac-win.el (process-connection-type): Removed.
* term/mac-win.el (process-connection-type): Remove.
Controlled now by s/darwin.h:PTY_ITERATION.
 
2005-01-20 Stefan Monnier <monnier@iro.umontreal.ca>
......
;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
;;
;; Copyright (C) 1996,97,1999,2000,01,02,03,2004 Free Software Foundation, Inc.
;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: FSF
......@@ -898,8 +899,6 @@ then prompt for the MODE to customize."
(let (
;; Copied from `custom-buffer-create-other-window'.
(pop-up-windows t)
(special-display-buffer-names nil)
(special-display-regexps nil)
(same-window-buffer-names nil)
(same-window-regexps nil))
(pop-to-buffer name))
......@@ -1246,8 +1245,6 @@ SYMBOL is a customization option, and WIDGET is a widget for editing
that option."
(unless name (setq name "*Customization*"))
(let ((pop-up-windows t)
(special-display-buffer-names nil)
(special-display-regexps nil)
(same-window-buffer-names nil)
(same-window-regexps nil))
(pop-to-buffer (custom-get-fresh-buffer name))
......@@ -4072,23 +4069,23 @@ The format is suitable for use with `easy-menu-define'."
;;; The Custom Mode.
(defvar custom-mode-map nil
"Keymap for `custom-mode'.")
(unless custom-mode-map
(defvar custom-mode-map
;; This keymap should be dense, but a dense keymap would prevent inheriting
;; "\r" bindings from the parent map.
(setq custom-mode-map (make-sparse-keymap))
(set-keymap-parent custom-mode-map widget-keymap)
(suppress-keymap custom-mode-map)
(define-key custom-mode-map " " 'scroll-up)
(define-key custom-mode-map "\177" 'scroll-down)
(define-key custom-mode-map "\C-x\C-s" 'Custom-save)
(define-key custom-mode-map "q" 'Custom-buffer-done)
(define-key custom-mode-map "u" 'Custom-goto-parent)
(define-key custom-mode-map "n" 'widget-forward)
(define-key custom-mode-map "p" 'widget-backward)
(define-key custom-mode-map [mouse-1] 'Custom-move-and-invoke))
;; Actually, this misfeature of dense keymaps was fixed on 2001-11-26.
(let ((map (make-keymap)))
(set-keymap-parent map widget-keymap)
(suppress-keymap map)
(define-key map " " 'scroll-up)
(define-key map "\177" 'scroll-down)
(define-key map "\C-x\C-s" 'Custom-save)
(define-key map "q" 'Custom-buffer-done)
(define-key map "u" 'Custom-goto-parent)
(define-key map "n" 'widget-forward)
(define-key map "p" 'widget-backward)
(define-key map [mouse-1] 'Custom-move-and-invoke)
map)
"Keymap for `custom-mode'.")
(defun Custom-move-and-invoke (event)
"Move to where you click, and if it is an active field, invoke it."
......@@ -4187,5 +4184,5 @@ if that value is non-nil."
(provide 'cus-edit)
;;; arch-tag: 64533aa4-1b1a-48c3-8812-f9dc718e8a6f
;; arch-tag: 64533aa4-1b1a-48c3-8812-f9dc718e8a6f
;;; cus-edit.el ends here
......@@ -41,6 +41,17 @@
(gc-cons-threshold alloc integer)
(undo-limit undo integer)
(undo-strong-limit undo integer)
(undo-outer-limit undo
(choice integer
(const :tag "No limit"
:format "%t\n%d"
:doc
"With this choice, \
the undo info for the current command never gets discarded.
This should only be chosen under exceptional circumstances,
since it could result in memory overflow and make Emacs crash."
nil))
"21.4")
(garbage-collection-messages alloc boolean)
;; buffer.c
(mode-line-format modeline sexp) ;Hard to do right.
......
;;; descr-text.el --- describe text mode
;; Copyright (c) 1994, 1995, 1996, 2001, 2002, 2003, 2004
;; Copyright (c) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Keywords: faces
;; Keywords: faces, i18n, Unicode, multilingual
;; This file is part of GNU Emacs.
......@@ -217,7 +217,7 @@ otherwise."
(defcustom describe-char-unicodedata-file nil
"Location of Unicode data file.
This is the UnicodeData.txt file from the Unicode consortium, used for
diagnostics. If it is non-nil `describe-char-after' will print data
diagnostics. If it is non-nil `describe-char' will print data
looked up from it. This facility is mostly of use to people doing
multilingual development.
......
;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004
;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Maintainer: FSF
......@@ -602,7 +602,7 @@ Reinitialize the face according to the `defface' specification."
(boundp (cadr form)))
;; Force variable to be re-set.
`(progn (defvar ,(nth 1 form) nil ,@(nthcdr 3 form))
(setq ,(nth 1 form) ,(nth 2 form))))
(setq-default ,(nth 1 form) ,(nth 2 form))))
;; `defcustom' is now macroexpanded to
;; `custom-declare-variable' with a quoted value arg.
((and (eq (car form) 'custom-declare-variable)
......
2005-01-28 Stefan Monnier <monnier@iro.umontreal.ca>
* message.el (message-beginning-of-line): Change the behavior when
invoked between BOL and : so that it first moves backward.
2005-01-28 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-article-setup-buffer): Kill and re-create the
article buffer when editing of the article is discarded.
(gnus-article-prepare): Revert.
2005-01-28 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-article-prepare): Remove
message-strip-forbidden-properties from the local hook.
2005-01-24 Katsumi Yamaoka <yamaoka@jpl.org>
* mml.el (mml-generate-mime-1): Convert string into unibyte when
inserting " *mml*" buffer's contents into a unibyte temp buffer.
2005-01-20 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-decode.el (mm-insert-part): Switch the multibyteness of data
......@@ -14,8 +35,7 @@
* mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME)
and we have trailing white space. Reported by Werner Koch
<wk@gnupg.org>.
and we have trailing white space. Reported by Werner Koch <wk@gnupg.org>.
2004-12-17 Kim F. Storm <storm@cua.dk>
......@@ -58,8 +78,8 @@
2004-12-13 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-group.el (gnus-group-make-rss-group): Use
gnus-group-make-group instead of gnus-group-unsubscribe-group.
* gnus-group.el (gnus-group-make-rss-group):
Use gnus-group-make-group instead of gnus-group-unsubscribe-group.
* gnus-start.el (gnus-setup-news): Honor user's setting to
gnus-message-archive-method. Suggested by Lute Kamstra
......
;;; gnus-art.el --- article mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
......@@ -3743,14 +3743,19 @@ commands:
(mm-enable-multibyte)
(setq major-mode 'gnus-original-article-mode)
(make-local-variable 'gnus-original-article))
(if (get-buffer name)
(if (and (get-buffer name)
(with-current-buffer name
(if gnus-article-edit-mode
(if (y-or-n-p "Article mode edit in progress; discard? ")
(progn
(set-buffer-modified-p nil)
(gnus-kill-buffer name)
(message "")
nil)
(error "Action aborted"))
t)))
(save-excursion
(set-buffer name)
(when (and gnus-article-edit-mode
(buffer-modified-p)
(not
(y-or-n-p "Article mode edit in progress; discard? ")))
(error "Action aborted"))
(set (make-local-variable 'gnus-article-edit-mode) nil)
(when gnus-article-mime-handles
(mm-destroy-parts gnus-article-mime-handles)
......
;;; message.el --- composing mail and news messages
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
......@@ -800,7 +800,7 @@ variable isn't used."
;; is nil. See: http://article.gmane.org/gmane.emacs.gnus.general/51138
(defcustom message-generate-headers-first '(references)
"Which headers should be generated before starting to compose a message.
If `t', generate all required headers. This can also be a list of headers to
If t, generate all required headers. This can also be a list of headers to
generate. The variables `message-required-news-headers' and
`message-required-mail-headers' specify which headers to generate.
......@@ -5295,10 +5295,10 @@ outside the message header or if the option `message-beginning-of-line'
is nil.
If point is in the message header and on a (non-continued) header
line, move point to the beginning of the header value. If point
is already there, move point to beginning of line. Therefore,
repeated calls will toggle point between beginning of field and
beginning of line."
line, move point to the beginning of the header value or the beginning of line,
whichever is closer. If point is already at beginning of line, move point to
beginning of header value. Therefore, repeated calls will toggle point
between beginning of field and beginning of line."
(interactive "p")
(let ((zrs 'zmacs-region-stays))
(when (and (interactive-p) (boundp zrs))
......@@ -5309,9 +5309,9 @@ beginning of line."
(bol (progn (beginning-of-line n) (point)))
(eol (gnus-point-at-eol))
(eoh (re-search-forward ": *" eol t)))
(if (or (not eoh) (equal here eoh))
(goto-char bol)
(goto-char eoh)))
(goto-char
(if (and eoh (or (< eoh here) (= bol here)))
eoh bol)))
(beginning-of-line n)))
(defun message-buffer-name (type &optional to group)
......@@ -6880,5 +6880,5 @@ regexp VARSTR."
;; coding: iso-8859-1
;; End:
;;; arch-tag: 94b32cac-4504-4b6c-8181-030ebf380ee0
;; arch-tag: 94b32cac-4504-4b6c-8181-030ebf380ee0
;;; message.el ends here
;;; mml.el --- A package for parsing and validating MML documents
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
......@@ -471,7 +471,9 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
(mm-with-unibyte-buffer
(cond
((cdr (assq 'buffer cont))
(insert-buffer-substring (cdr (assq 'buffer cont))))
(insert (with-current-buffer (cdr (assq 'buffer cont))
(mm-with-unibyte-current-buffer
(buffer-string)))))
((and (setq filename (cdr (assq 'filename cont)))
(not (equal (cdr (assq 'nofile cont)) "yes")))
(let ((coding-system-for-read mm-binary-coding-system))
......
......@@ -146,6 +146,7 @@ This is done by setting a timer, if none is currently active."
(run-with-idle-timer
help-at-pt-timer-delay t #'help-at-pt-maybe-display))))
;;;###autoload
(defcustom help-at-pt-display-when-idle 'never
"*Automatically show local help on point-over.
If the value is t, the string obtained from any `kbd-help' or
......
;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
;; Licensed to the Free Software Foundation.
;; Copyright (C) 2003
......@@ -1839,12 +1839,14 @@ Setting this variable directly does not take effect. See
;; different there.
(or (and (eq window-system 'pc) (not default-enable-multibyte-characters))
(progn
;; Make non-line-break space display as a plain space.
;; Most X fonts do the wrong thing for code 160.
(aset standard-display-table 160 [32])
;; With luck, non-Latin-1 fonts are more recent and so don't
;; have this bug.
(aset standard-display-table (make-char 'latin-iso8859-1 160) [32])
;; Most X fonts used to do the wrong thing for latin-1 code 160.
(unless (and (eq window-system 'x)
;; XFree86 4 has fixed the fonts.
(string= "The XFree86 Project, Inc" (x-server-vendor))
(> (aref (number-to-string (nth 2 (x-server-version))) 0)
?3))
;; Make non-line-break space display as a plain space.
(aset standard-display-table 160 [32]))
;; Most Windows programs send out apostrophes as \222. Most X fonts
;; don't contain a character at that position. Map it to the ASCII
;; apostrophe. [This is actually RIGHT SINGLE QUOTATION MARK,
......@@ -1852,23 +1854,7 @@ Setting this variable directly does not take effect. See
;; fonts probably have the appropriate glyph at this position,
;; so they could use standard-display-8bit. It's better to use a
;; proper windows-1252 coding system. --fx]
(aset standard-display-table 146 [39])
;; XFree86 4 has changed most of the fonts from their designed
;; versions such that `' no longer appears as balanced quotes.
;; Assume it has iso10646 fonts installed, so we can display
;; balanced quotes.
(when (and (eq window-system 'x)
(string= "The XFree86 Project, Inc" (x-server-vendor))
(> (aref (number-to-string (nth 2 (x-server-version))) 0)
?3))
;; We suppress these setting for the moment because the
;; above assumption is wrong.
;; (aset standard-display-table ?' [?,F"(B])
;; (aset standard-display-table ?` [?,F!(B])
;; The fonts don't have the relevant bug.
(aset standard-display-table 160 nil)
(aset standard-display-table (make-char 'latin-iso8859-1 160)
nil)))))
(aset standard-display-table 146 [39]))))
(defun set-language-environment-coding-systems (language-name
&optional eol-type)
......@@ -1924,8 +1910,7 @@ of `buffer-file-coding-system' set by this function."
(setq language-name (symbol-name language-name)))
(dolist (feature (get-language-info language-name 'features))
(require feature))
(let ((doc (get-language-info language-name 'documentation))
pos)
(let ((doc (get-language-info language-name 'documentation)))
(help-setup-xref (list #'describe-language-environment language-name)
(interactive-p))
(with-output-to-temp-buffer (help-buffer)
......
......@@ -1143,7 +1143,7 @@ static char *magick[] = {
(setq bptno (match-string 1))
(setq flag (char-after (match-beginning 2)))
(beginning-of-line)
(if (re-search-forward "in\\s-+\\S-+\\s-+at\\s-+" nil t)
(if (re-search-forward "in.*at\\s-+" nil t)
(progn
(looking-at "\\(\\S-+\\):\\([0-9]+\\)")
(let ((line (match-string 2)) (buffer-read-only nil)
......@@ -1298,7 +1298,7 @@ static char *magick[] = {
(save-excursion
(beginning-of-line 1)
(if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
(looking-at ".*in\\s-+\\S-+\\s-+at\\s-+\\(\\S-*\\):\\([0-9]+\\)")
(looking-at ".*in.*at\\s-+\\(\\S-*\\):\\([0-9]+\\)")
(looking-at
"[0-9]+\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\(\\S-*\\):\\([0-9]+\\)"))
(let ((line (match-string 2))
......
;;; scheme.el --- Scheme (and DSSSL) editing mode
;; Copyright (C) 1986, 87, 88, 97, 1998 Free Software Foundation, Inc.
;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2005
;; Free Software Foundation, Inc.
;; Author: Bill Rozas <jinx@martigny.ai.mit.edu>
;; Adapted-by: Dave Love <d.love@dl.ac.uk>
......@@ -144,6 +145,7 @@
(setq outline-regexp ";;; \\|(....")
(make-local-variable 'comment-start)
(setq comment-start ";")
(set (make-local-variable 'comment-add) 1)
(make-local-variable 'comment-start-skip)
;; Look within the line for a ; following an even number of backslashes
;; after either a non-backslash or the line beginning.
......@@ -171,17 +173,11 @@
(defvar scheme-mode-line-process "")
(defvar scheme-mode-map nil
"Keymap for Scheme mode.
All commands in `lisp-mode-shared-map' are inherited by this map.")
(unless scheme-mode-map
(let ((map (make-sparse-keymap "Scheme")))
(setq scheme-mode-map (make-sparse-keymap))
(set-keymap-parent scheme-mode-map lisp-mode-shared-map)
(define-key scheme-mode-map [menu-bar] (make-sparse-keymap))
(define-key scheme-mode-map [menu-bar scheme]
(cons "Scheme" map))
(defvar scheme-mode-map
(let ((smap (make-sparse-keymap))
(map (make-sparse-keymap "Scheme")))
(set-keymap-parent smap lisp-mode-shared-map)
(define-key smap [menu-bar scheme] (cons "Scheme" map))
(define-key map [run-scheme] '("Run Inferior Scheme" . run-scheme))
(define-key map [uncomment-region]
'("Uncomment Out Region" . (lambda (beg end)
......@@ -192,7 +188,10 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
(define-key map [indent-line] '("Indent Line" . lisp-indent-line))
(put 'comment-region 'menu-enable 'mark-active)
(put 'uncomment-region 'menu-enable 'mark-active)
(put 'indent-region 'menu-enable 'mark-active)))
(put 'indent-region 'menu-enable 'mark-active)
smap)
"Keymap for Scheme mode.
All commands in `lisp-mode-shared-map' are inherited by this map.")
;; Used by cmuscheme
(defun scheme-mode-commands (map)
......@@ -222,14 +221,11 @@ Entry to this mode calls the value of `scheme-mode-hook'
if that value is non-nil."
(interactive)
(kill-all-local-variables)
(scheme-mode-initialize)
(scheme-mode-variables)
(run-hooks 'scheme-mode-hook))
(defun scheme-mode-initialize ()
(use-local-map scheme-mode-map)
(setq major-mode 'scheme-mode)
(setq mode-name "Scheme"))
(setq mode-name "Scheme")
(scheme-mode-variables)
(run-mode-hooks 'scheme-mode-hook))
(defgroup scheme nil
"Editing Scheme code"
......@@ -346,7 +342,7 @@ See `run-hooks'."
"Default expressions to highlight in Scheme modes.")
;;;###autoload
(defun dsssl-mode ()
(define-derived-mode dsssl-mode scheme-mode "DSSSL"
"Major mode for editing DSSSL code.
Editing commands are similar to those of `lisp-mode'.
......@@ -357,20 +353,16 @@ Blank lines separate paragraphs. Semicolons start comments.
Entering this mode runs the hooks `scheme-mode-hook' and then
`dsssl-mode-hook' and inserts the value of `dsssl-sgml-declaration' if
that variable's value is a string."
(interactive)
(kill-all-local-variables)
(use-local-map scheme-mode-map)
(scheme-mode-initialize)
(make-local-variable 'page-delimiter)
(setq page-delimiter "^;;;" ; ^L not valid SGML char
major-mode 'dsssl-mode
mode-name "DSSSL")
;; Insert a suitable SGML declaration into an empty buffer.
;; FIXME: This should use `auto-insert-alist' instead.
(and (zerop (buffer-size))
(stringp dsssl-sgml-declaration)
(not buffer-read-only)
(insert dsssl-sgml-declaration))
(scheme-mode-variables)
(setq font-lock-defaults '(dsssl-font-lock-keywords
nil t (("+-*/.<>=?$%_&~^:" . "w"))
beginning-of-defun
......@@ -378,9 +370,7 @@ that variable's value is a string."
(set (make-local-variable 'imenu-case-fold-search) nil)
(setq imenu-generic-expression dsssl-imenu-generic-expression)
(set (make-local-variable 'imenu-syntax-alist)
'(("+-*/.<>=?$%_&~^:" . "w")))
(run-hooks 'scheme-mode-hook)
(run-hooks 'dsssl-mode-hook))
'(("+-*/.<>=?$%_&~^:" . "w"))))
;; Extra syntax for DSSSL. This isn't separated from Scheme, but
;; shouldn't cause much trouble in scheme-mode.
......@@ -558,5 +548,5 @@ that variable's value is a string."
(provide 'scheme)
;;; arch-tag: a8f06bc1-ad11-42d2-9e36-ce651df37a90
;; arch-tag: a8f06bc1-ad11-42d2-9e36-ce651df37a90
;;; scheme.el ends here
;;; speedbar.el --- quick access to files and tags in a frame
;;; Copyright (C) 1996, 97, 98, 99, 2000, 01 Free Software Foundation
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2005
;; Free Software Foundation
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Version: 0.11a
......@@ -170,6 +171,8 @@
;; - More functions to create buttons and options
;; - Timeout directories we haven't visited in a while.
;;; Code:
(require 'assoc)
(require 'easymenu)
......@@ -201,7 +204,6 @@
:prefix "speedbar-"
:group 'speedbar)
;;; Code:
(defvar speedbar-initial-expansion-mode-alist
'(("buffers" speedbar-buffer-easymenu-definition speedbar-buffers-key-map
speedbar-buffer-buttons)
......@@ -373,7 +375,7 @@ is attached to."
(symbol :tag "Property")
(sexp :tag "Value"))))
(defcustom speedbar-use-imenu-flag (stringp (locate-library "imenu"))
(defcustom speedbar-use-imenu-flag (fboundp 'imenu)
"*Non-nil means use imenu for file parsing. nil to use etags.
XEmacs prior to 20.4 doesn't support imenu, therefore the default is to
use etags instead. Etags support is not as robust as imenu support."
......@@ -3749,7 +3751,7 @@ functions to do caching and flushing if appropriate."
nil
(eval-when-compile (if (locate-library "imenu") (require 'imenu)))
(eval-when-compile (condition-case nil (require 'imenu) (error nil)))
(defun speedbar-fetch-dynamic-imenu (file)
"Load FILE into a buffer, and generate tags using Imenu.
......@@ -4359,5 +4361,5 @@ If we have an image associated with it, use that image."
;; run load-time hooks
(run-hooks 'speedbar-load-hook)
;;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5
;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5
;;; speedbar.el ends here
......@@ -173,7 +173,7 @@ See also `bibtex-sort-ignore-string-entries'."
If value of `bibtex-maintain-sorted-entries' is `entry-class'
entries are ordered according to the classes they belong to. Each
class contains a list of entry names. An entry `catch-all' applies