summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog62
-rw-r--r--lisp/cedet/semantic/db-find.el2
-rw-r--r--lisp/cedet/semantic/imenu.el8
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/mm-uu.el6
-rw-r--r--lisp/help.el7
-rw-r--r--lisp/info.el69
-rw-r--r--lisp/ldefs-boot.el97
-rw-r--r--lisp/textmodes/artist.el2
-rw-r--r--lisp/textmodes/tex-mode.el2
-rw-r--r--lisp/version.el2
11 files changed, 177 insertions, 85 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ec8d9ac887..1870690f89b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,44 @@
(kannada-composable-pattern): Fix U+0CB0 and typo in the regexp.
(malayalam-composable-pattern): Fix U+0D4D and typo in the regexp.
+2010-04-06 Chong Yidong <cyd@stupidchicken.com>
+
+ * textmodes/tex-mode.el (latex-mode): Revert 2008-03-03 change to
+ paragraph-separate (Bug#5821).
+
+2010-04-05 Juri Linkov <juri@jurta.org>
+
+ Put breadcrumbs on overlay instead of inserting to buffer (bug#5809).
+
+ * info.el (Info-find-node-2): Comment out code that skips
+ breadcrumbs line.
+ (Info-mouse-follow-link): New command.
+ (Info-link-keymap): New keymap.
+ (Info-breadcrumbs): Rename from `Info-insert-breadcrumbs'.
+ Return a string with links instead of inserting breadcrumbs
+ to the Info buffer.
+ (Info-fontify-node): Comment out code that inserts breadcrumbs.
+ Instead of putting the `invisible' text property over the Info
+ header, make an overlay over the Info header with the `invisible'
+ property and `after-string' set to the string returned by
+ `Info-breadcrumbs'.
+
+2010-04-03 Chong Yidong <cyd@stupidchicken.com>
+
+ * help.el (help-window-setup-finish): Doc fix (Bug#5830).
+ Reported by monkey@sandpframing.com.
+
+2010-04-02 Juanma Barranquero <lekktu@gmail.com>
+
+ * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members)
+ (semantic-create-imenu-directory-index): Fix typos in docstrings.
+ (semantic-imenu-goto-function): Reflow docstring.
+
+2010-03-30 Tomas Abrahamsson <tab@lysator.liu.se>
+
+ * textmodes/artist.el (artist-mode): Fix typo in docstring.
+ Reported by Alex Schröder <kensanata@gmail.com>. (Bug#5807)
+
2010-03-30 Kenichi Handa <handa@m17n.org>
* language/sinhala.el (composition-function-table): Fix regexp for
@@ -15,7 +53,7 @@
* language/indian.el (devanagari-composable-pattern)
(tamil-composable-pattern, kannada-composable-pattern)
- (malayalam-composable-pattern): Adjusted for the new Unicode
+ (malayalam-composable-pattern): Adjust for the new Unicode
specification.
(bengali-composable-pattern, gurmukhi-composable-pattern)
(gujarati-composable-pattern, oriya-composable-pattern)
@@ -3329,7 +3367,7 @@
* bookmark.el: Formatting and doc fixes only:
(bookmark-search-delay): Shorten doc string to fit in 80 columns.
(bookmark-bmenu-search): Wrap to fit within 80 columns.
- Minor grammar and punctuation fixes in doc string.
+ Minor grammar and punctuation fixes in doc string.
(bookmark-read-search-input): Adjust to fit within 80 columns.
2009-11-20 Tassilo Horn <tassilo@member.fsf.org>
@@ -6084,12 +6122,12 @@
2009-10-05 Karl Fogel <kfogel@red-bean.com>
* bookmark.el (bookmark-handle-bookmark): If bookmark has no file,
- don't do anything related to relocating, just return nil.
+ don't do anything related to relocating, just return nil.
(bookmark-error-no-filename): New error.
(bookmark-default-handler): Signal `bookmark-error-no-filename' if
- bookmark has no file. Don't even attempt to handle things that
- are not files; the whole point of custom handlers is to keep that
- knowledge elsewhere anyway. Tighten some comments.
+ bookmark has no file. Don't even attempt to handle things that
+ are not files; the whole point of custom handlers is to keep that
+ knowledge elsewhere anyway. Tighten some comments.
(bookmark-file-or-variation-thereof): Remove now-unused function.
(bookmark-location): Doc string fix.
(Bug#4250)
@@ -6119,8 +6157,8 @@
(bookmark-relocate, bookmark-insert-location, bookmark-rename)
(bookmark-insert, bookmark-delete, bookmark-time-to-save-p)
(bookmark-edit-annotation-mode, bookmark-edit-annotation):
- Improve doc strings to say whether bookmark can be a string or
- a record or both, and make other consistency and clarity fixes.
+ Improve doc strings to say whether bookmark can be a string or
+ a record or both, and make other consistency and clarity fixes.
(bookmark-get-handler, bookmark--jump-via, bookmark-write-file)
(bookmark-default-annotation-text, bookmark-yank-word)
(bookmark-maybe-load-default-file, bookmark-maybe-sort-alist)
@@ -6128,12 +6166,12 @@
(bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames)
(bookmark-bmenu-bookmark): Give these doc strings.
(bookmark-bmenu-check-position): Give this a doc string, but also
- add a FIXME comment about how the function may be pointless.
+ add a FIXME comment about how the function may be pointless.
(bookmark-default-handler): Rework doc string and change a
- parameter name, to clarify that this takes a bookmark record
- not a bookmark name.
+ parameter name, to clarify that this takes a bookmark record
+ not a bookmark name.
(bookmark-set): Change a parameter name to indicate its meaning,
- and improve the doc string a bit.
+ and improve the doc string a bit.
(Bug#4188)
2009-10-04 Karl Fogel <kfogel@red-bean.com>
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 754ba231c37..4c2626ca8bd 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -774,7 +774,7 @@ Examines the variable `semanticdb-find-lost-includes'."
(buffer-name))
(data-debug-new-buffer "*SEMANTICDB lost-includes ADEBUG*")
- (data-debug-insert-tag-list lost "*")
+ ;; (data-debug-insert-tag-list lost "*")
)))
(defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext)
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 3c73b893925..9ce986553aa 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -95,7 +95,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil."
(defcustom semantic-imenu-bucketize-type-members t
"*Non-nil if members of a type should be grouped into buckets.
-nil means to keep them in the same order.
+A nil value means to keep them in the same order.
Overriden to nil if `semantic-imenu-bucketize-file' is nil."
:group 'semantic-imenu
:type 'boolean)
@@ -167,8 +167,8 @@ concoct a combination of file name, and position."
(defun semantic-imenu-goto-function (name position &optional rest)
"Move point associated with NAME to POSITION.
-Used to override function `imenu-default-goto-function' so that we can continue
-to use overlays to maintain the current position.
+Used to override function `imenu-default-goto-function' so that
+we can continue to use overlays to maintain the current position.
Optional argument REST is some extra stuff."
(require 'pulse)
(if (semantic-overlay-p position)
@@ -249,7 +249,7 @@ Optional argument STREAM is an optional stream of tags used to create menus."
'semantic-imenu-flush-fcn nil t)))
(defun semantic-create-imenu-directory-index (&optional stream)
- "Create an IMENU tag index based on all files active in semanticdb.
+ "Create an imenu tag index based on all files active in semanticdb.
Optional argument STREAM is the stream of tags for the current buffer."
(if (not semanticdb-current-database)
(semantic-create-imenu-index-1 stream nil)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0106e6212c5..8cbee9138c2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-01 Andreas Schwab <schwab@linux-m68k.org>
+
+ * mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system
+ if set.
+
2010-03-29 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag.
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index c690713ef14..5ae9205e2f0 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -486,9 +486,11 @@ apply the face `mm-uu-extract'."
(if (mm-uu-pgp-signed-test)
(progn
(mml2015-clean-buffer)
- (let ((coding-system-for-write (or gnus-newsgroup-charset
+ (let ((coding-system-for-write (or buffer-file-coding-system
+ gnus-newsgroup-charset
'iso-8859-1))
- (coding-system-for-read (or gnus-newsgroup-charset
+ (coding-system-for-read (or buffer-file-coding-system
+ gnus-newsgroup-charset
'iso-8859-1)))
(funcall (mml2015-clear-verify-function))))
(when (and mml2015-use (null (mml2015-clear-verify-function)))
diff --git a/lisp/help.el b/lisp/help.el
index 9fb993e7173..0c231a78b91 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1046,10 +1046,9 @@ scroll the \"other\" window."
Select WINDOW according to the value of `help-window-select'.
Display message telling how to scroll and eventually quit WINDOW.
-Optional argument REUSE non-nil means WINDOW has been reused \(by
-`display-buffer'\) for displaying help. Optional argument
-KEEP-FRAME non-nil means that quitting must no delete the frame
-of WINDOW."
+Optional argument REUSE non-nil means WINDOW has been reused by
+`display-buffer'. Optional argument KEEP-FRAME non-nil means
+that quitting should not delete WINDOW's frame."
(let ((number-of-windows
(length (window-list (window-frame window) 'no-mini window))))
(cond
diff --git a/lisp/info.el b/lisp/info.el
index a1ce05d6292..c4b942bf8a1 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1053,8 +1053,8 @@ a case-insensitive match is tried."
(Info-select-node)
(goto-char (point-min))
(forward-line 1) ; skip header line
- (when (> Info-breadcrumbs-depth 0) ; skip breadcrumbs line
- (forward-line 1))
+ ;; (when (> Info-breadcrumbs-depth 0) ; skip breadcrumbs line
+ ;; (forward-line 1))
(cond (anchorpos
(let ((new-history (list Info-current-file
@@ -3551,6 +3551,19 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
((setq node (Info-get-token (point) "Prev: " "Prev: \\([^,\n\t]*\\)"))
(Info-goto-node node fork)))
node))
+
+(defun Info-mouse-follow-link (click)
+ "Follow a link where you click."
+ (interactive "e")
+ (let* ((position (event-start click))
+ (posn-string (and position (posn-string position)))
+ (string (car-safe posn-string))
+ (string-pos (cdr-safe posn-string))
+ (link-args (and string string-pos
+ (get-text-property string-pos 'link-args string))))
+ (when link-args
+ (Info-goto-node link-args))))
+
(defvar Info-mode-map
(let ((map (make-keymap)))
@@ -4141,11 +4154,22 @@ the variable `Info-file-list-for-emacs'."
keymap)
"Keymap to put on the Up link in the text or the header line.")
-(defun Info-insert-breadcrumbs ()
+(defvar Info-link-keymap
+ (let ((keymap (make-sparse-keymap)))
+ (define-key keymap [header-line mouse-1] 'Info-mouse-follow-link)
+ (define-key keymap [header-line mouse-2] 'Info-mouse-follow-link)
+ (define-key keymap [header-line down-mouse-1] 'ignore)
+ (define-key keymap [mouse-2] 'Info-mouse-follow-link)
+ (define-key keymap [follow-link] 'mouse-face)
+ keymap)
+ "Keymap to put on the link in the text or the header line.")
+
+(defun Info-breadcrumbs ()
(let ((nodes (Info-toc-nodes Info-current-file))
(node Info-current-node)
(crumbs ())
- (depth Info-breadcrumbs-depth))
+ (depth Info-breadcrumbs-depth)
+ line)
;; Get ancestors from the cached parent-children node info
(while (and (not (equal "Top" node)) (> depth 0))
@@ -4172,15 +4196,25 @@ the variable `Info-file-list-for-emacs'."
(file-name-nondirectory Info-current-file)
;; Some legacy code can still use a symbol.
Info-current-file)))))
- (insert (if (bolp) "" " > ")
- (cond
- ((null node) "...")
- ((equal node Info-current-node)
- ;; No point linking to ourselves.
- (propertize text 'font-lock-face 'info-header-node))
- (t
- (concat "*Note " text "::"))))))
- (insert "\n"))))
+ (setq line (concat
+ line
+ (if (null line) "" " > ")
+ (cond
+ ((null node) "...")
+ ((equal node Info-current-node)
+ ;; No point linking to ourselves.
+ (propertize text 'font-lock-face 'info-header-node))
+ (t
+ (propertize text
+ 'mouse-face 'highlight
+ 'font-lock-face 'info-header-xref
+ 'help-echo "mouse-2: Go to node"
+ 'keymap Info-link-keymap
+ 'link-args text)))))))
+ (setq line (concat line "\n")))
+ ;; (font-lock-append-text-property 0 (length line)
+ ;; 'font-lock-face 'header-line line)
+ line))
(defun Info-fontify-node ()
"Fontify the node."
@@ -4227,8 +4261,8 @@ the variable `Info-file-list-for-emacs'."
((string-equal (downcase tag) "next") Info-next-link-keymap)
((string-equal (downcase tag) "up" ) Info-up-link-keymap))))))
- (when (> Info-breadcrumbs-depth 0)
- (Info-insert-breadcrumbs))
+ ;; (when (> Info-breadcrumbs-depth 0)
+ ;; (insert (Info-breadcrumbs)))
;; Treat header line.
(when Info-use-header-line
@@ -4260,7 +4294,10 @@ the variable `Info-file-list-for-emacs'."
;; that is in the header, if it is just part.
(cond
((> Info-breadcrumbs-depth 0)
- (put-text-property (point-min) (1+ header-end) 'invisible t))
+ (let ((ov (make-overlay (point-min) (1+ header-end))))
+ (overlay-put ov 'invisible t)
+ (overlay-put ov 'after-string (Info-breadcrumbs))
+ (overlay-put ov 'evaporate t)))
((not (bobp))
;; Hide the punctuation at the end, too.
(skip-chars-backward " \t,")
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index c60b644753c..d4ccb4ceea7 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -1149,8 +1149,8 @@ Entering array mode calls the function `array-mode-hook'.
;;;***
-;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19352
-;;;;;; 21362))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19378
+;;;;;; 33860))
;;; Generated autoloads from textmodes/artist.el
(autoload 'artist-mode "artist" "\
@@ -1319,7 +1319,7 @@ Selecting operation
Variables
- This is a brief overview of the different varaibles. For more info,
+ This is a brief overview of the different variables. For more info,
see the documentation for the variables (type \\[describe-variable] <variable> RET).
artist-rubber-banding Interactively do rubber-banding or not
@@ -2963,7 +2963,7 @@ Obsoletes `c-forward-into-nomenclature'.
;;;***
;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;; (19352 21360))
+;;;;;; (19367 42950))
;;; Generated autoloads from progmodes/cc-engine.el
(autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -4851,7 +4851,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
;;;;;; customize-mode customize customize-save-variable customize-set-variable
;;;;;; customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically
;;;;;; custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el"
-;;;;;; (19352 21362))
+;;;;;; (19359 48895))
;;; Generated autoloads from cus-edit.el
(defvar custom-browse-sort-alphabetically nil "\
@@ -5719,7 +5719,7 @@ as well as widgets, buttons, overlays, and text properties.
;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
;;;;;; desktop-load-default desktop-read desktop-remove desktop-save
;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
-;;;;;; "desktop.el" (19352 21353))
+;;;;;; "desktop.el" (19370 51420))
;;; Generated autoloads from desktop.el
(defvar desktop-save-mode nil "\
@@ -10459,7 +10459,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" (19352 21362))
+;;;;;; "flyspell" "textmodes/flyspell.el" (19369 7847))
;;; Generated autoloads from textmodes/flyspell.el
(autoload 'flyspell-prog-mode "flyspell" "\
@@ -10782,7 +10782,7 @@ and choose the directory as the fortune-file.
;;;***
;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;; (19352 21362))
+;;;;;; (19372 60979))
;;; Generated autoloads from progmodes/gdb-ui.el
(autoload 'gdb "gdb-ui" "\
@@ -13641,8 +13641,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" (19352
-;;;;;; 21354))
+;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19355
+;;;;;; 62587))
;;; Generated autoloads from ido.el
(defvar ido-mode nil "\
@@ -14118,7 +14118,7 @@ Example:
;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag
;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
;;;;;; image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs)
-;;;;;; "image-dired" "image-dired.el" (19352 21354))
+;;;;;; "image-dired" "image-dired.el" (19367 42949))
;;; Generated autoloads from image-dired.el
(autoload 'image-dired-dired-insert-marked-thumbs "image-dired" "\
@@ -14160,7 +14160,7 @@ you have the dired buffer in the left window and the
With optional argument APPEND, append thumbnail to thumbnail buffer
instead of erasing it first.
-Option argument DO-NOT-POP controls if `pop-to-buffer' should be
+Optional argument DO-NOT-POP controls if `pop-to-buffer' should be
used or not. If non-nil, use `display-buffer' instead of
`pop-to-buffer'. This is used from functions like
`image-dired-next-line-and-display' and
@@ -15367,7 +15367,7 @@ by `jka-compr-installed'.
;;;***
-;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19352 21355))
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19375 48608))
;;; Generated autoloads from progmodes/js.el
(autoload 'js-mode "js" "\
@@ -16475,7 +16475,7 @@ The mail client is taken to be the handler of mailto URLs.
;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode)
-;;;;;; "make-mode" "progmodes/make-mode.el" (19352 21355))
+;;;;;; "make-mode" "progmodes/make-mode.el" (19370 15152))
;;; Generated autoloads from progmodes/make-mode.el
(autoload 'makefile-mode "make-mode" "\
@@ -16707,7 +16707,7 @@ Returns non-nil if the new state is enabled.
;;;;;; message-forward-make-body message-forward message-recover
;;;;;; message-supersede message-cancel-news message-followup message-wide-reply
;;;;;; message-reply message-news message-mail message-mode) "message"
-;;;;;; "gnus/message.el" (19352 21361))
+;;;;;; "gnus/message.el" (19374 17766))
;;; Generated autoloads from gnus/message.el
(define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -17353,7 +17353,7 @@ Insert file contents of URL using `mm-url-program'.
;;;***
;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu"
-;;;;;; "gnus/mm-uu.el" (19352 21355))
+;;;;;; "gnus/mm-uu.el" (19382 2266))
;;; Generated autoloads from gnus/mm-uu.el
(autoload 'mm-uu-dissect "mm-uu" "\
@@ -22562,8 +22562,8 @@ of master file.
;;;***
-;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19352
-;;;;;; 21358))
+;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19367
+;;;;;; 42950))
;;; 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))))
@@ -22815,8 +22815,8 @@ variable.
;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
;;;;;; rmail-dont-reply-to-names rmail-user-mail-address-regexp
-;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19352
-;;;;;; 21360))
+;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19363
+;;;;;; 36802))
;;; Generated autoloads from mail/rmail.el
(autoload 'rmail-movemail-variant-p "rmail" "\
@@ -23783,7 +23783,7 @@ Semantic mode.
;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name
;;;;;; mail-header-separator send-mail-function mail-interactive
;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style)
-;;;;;; "sendmail" "mail/sendmail.el" (19352 21361))
+;;;;;; "sendmail" "mail/sendmail.el" (19374 15070))
;;; Generated autoloads from mail/sendmail.el
(defvar mail-from-style 'default "\
@@ -23937,9 +23937,11 @@ File containing the text inserted at end of mail buffer.")
(custom-autoload 'mail-signature-file "sendmail" t)
(defvar mail-default-directory (purecopy "~/") "\
-Directory for mail buffers.
-Value of `default-directory' for mail buffers.
-This directory is used for auto-save files of mail buffers.")
+Value of `default-directory' for Mail mode buffers.
+This directory is used for auto-save files of Mail mode buffers.
+
+Note that Message mode does not use this variable; it auto-saves
+in `message-auto-save-directory'.")
(custom-autoload 'mail-default-directory "sendmail" t)
@@ -24660,7 +24662,7 @@ If no conflict maker is found, turn off `smerge-mode'.
;;;***
;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el"
-;;;;;; (19352 21358))
+;;;;;; (19367 42950))
;;; Generated autoloads from gnus/smiley.el
(autoload 'smiley-region "smiley" "\
@@ -24670,8 +24672,8 @@ A list of images is returned.
\(fn START END)" t nil)
(autoload 'smiley-buffer "smiley" "\
-Run `smiley-region' at the buffer, specified in the argument or
-interactively. If there's no argument, do it at the current buffer
+Run `smiley-region' at the BUFFER, specified in the argument or
+interactively. If there's no argument, do it at the current buffer.
\(fn &optional BUFFER)" t nil)
@@ -26678,7 +26680,7 @@ 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"
-;;;;;; (19352 21363))
+;;;;;; (19371 46148))
;;; Generated autoloads from textmodes/tex-mode.el
(defvar tex-shell-file-name nil "\
@@ -27673,7 +27675,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\".
;;;***
;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;; "tmm.el" (19352 21359))
+;;;;;; "tmm.el" (19376 53416))
;;; Generated autoloads from tmm.el
(define-key global-map "\M-`" 'tmm-menubar)
(define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse)
@@ -27923,7 +27925,7 @@ to a tcp server on another machine.
;;;***
;;;### (autoloads (trace-function-background trace-function trace-buffer)
-;;;;;; "trace" "emacs-lisp/trace.el" (19352 21359))
+;;;;;; "trace" "emacs-lisp/trace.el" (19367 42950))
;;; Generated autoloads from emacs-lisp/trace.el
(defvar trace-buffer (purecopy "*trace-output*") "\
@@ -27936,7 +27938,7 @@ Traces FUNCTION with trace output going to BUFFER.
For every call of FUNCTION Lisp-style trace messages that display argument
and return values will be inserted into BUFFER. This function generates the
trace advice for FUNCTION and activates it together with any other advice
-there might be!! The trace BUFFER will popup whenever FUNCTION is called.
+there might be!! The trace BUFFER will popup whenever FUNCTION is called.
Do not use this to trace functions that switch buffers or do any other
display oriented stuff, use `trace-function-background' instead.
@@ -27960,7 +27962,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-syntax tramp-mode) "tramp"
-;;;;;; "net/tramp.el" (19352 21361))
+;;;;;; "net/tramp.el" (19356 59749))
;;; Generated autoloads from net/tramp.el
(defvar tramp-mode t "\
@@ -29183,7 +29185,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
;;;;;; vc-create-tag vc-merge vc-insert-headers vc-revision-other-window
;;;;;; vc-root-diff vc-diff vc-version-diff vc-register vc-next-action
;;;;;; vc-before-checkin-hook vc-checkin-hook vc-checkout-hook)
-;;;;;; "vc" "vc.el" (19352 21359))
+;;;;;; "vc" "vc.el" (19371 62620))
;;; Generated autoloads from vc.el
(defvar vc-checkout-hook nil "\
@@ -29270,9 +29272,10 @@ saving the buffer.
\(fn HISTORIC &optional NOT-URGENT)" t nil)
(autoload 'vc-root-diff "vc" "\
-Display diffs between file revisions.
-Normally this compares the currently selected fileset with their
-working revisions. With a prefix argument HISTORIC, it reads two revision
+Display diffs between VC-controlled whole tree revisions.
+Normally, this compares the tree corresponding to the current
+fileset with the working revision.
+With a prefix argument HISTORIC, prompt for two revision
designators specifying which revisions to compare.
The optional argument NOT-URGENT non-nil means it is ok to say no to
@@ -29327,12 +29330,20 @@ allowed and simply skipped).
(autoload 'vc-print-log "vc" "\
List the change log of the current fileset in a window.
-If WORKING-REVISION is non-nil, leave the point at that revision.
+If WORKING-REVISION is non-nil, leave point at that revision.
+If LIMIT is non-nil, it should be a number specifying the maximum
+number of revisions to show; the default is `vc-log-show-limit'.
+
+When called interactively with a prefix argument, prompt for
+WORKING-REVISION and LIMIT.
\(fn &optional WORKING-REVISION LIMIT)" t nil)
(autoload 'vc-print-root-log "vc" "\
-List the change log of for the current VC controlled tree in a window.
+List the change log for the current VC controlled tree in a window.
+If LIMIT is non-nil, it should be a number specifying the maximum
+number of revisions to show; the default is `vc-log-show-limit'.
+When called interactively with a prefix argument, prompt for LIMIT.
\(fn &optional LIMIT)" t nil)
@@ -31435,7 +31446,7 @@ With arg, turn Winner mode on if and only if arg is positive.
;;;***
;;;### (autoloads (woman-find-file woman-dired-find-file woman woman-locale)
-;;;;;; "woman" "woman.el" (19352 21359))
+;;;;;; "woman" "woman.el" (19359 48737))
;;; Generated autoloads from woman.el
(defvar woman-locale nil "\
@@ -31788,8 +31799,8 @@ Zone out, completely.
;;;;;; "cedet/semantic/edit.el" "cedet/semantic/find.el" "cedet/semantic/format.el"
;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el"
;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el"
-;;;;;; "cedet/semantic/idle.el" "cedet/semantic/java.el" "cedet/semantic/lex-spp.el"
-;;;;;; "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el"
+;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el"
+;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el"
;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el"
;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el"
;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el"
@@ -31928,8 +31939,8 @@ Zone out, completely.
;;;;;; "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" "vc-dav.el" "vcursor.el" "vt-control.el"
-;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19352
-;;;;;; 23109 108328))
+;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19382
+;;;;;; 35538 347447))
;;;***
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index bc5f29482e7..41145afb766 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1319,7 +1319,7 @@ Selecting operation
Variables
- This is a brief overview of the different varaibles. For more info,
+ This is a brief overview of the different variables. For more info,
see the documentation for the variables (type \\[describe-variable] <variable> RET).
artist-rubber-banding Interactively do rubber-banding or not
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 38698af7885..5fc92a92d37 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1060,7 +1060,7 @@ subshell is initiated, `tex-shell-hook' is run."
"\\>\\|\\\\[a-z]*" (regexp-opt '("space" "skip" "page") t)
"\\>\\)"))
(setq paragraph-separate
- (concat "[\f]\\|[ \t]*\\($\\|"
+ (concat "[\f%]\\|[ \t]*\\($\\|"
"\\\\[][]\\|"
"\\\\" (regexp-opt (append
(mapcar 'car latex-section-alist)
diff --git a/lisp/version.el b/lisp/version.el
index fbdabd571af..c5c9bfa5fb6 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -32,7 +32,7 @@
(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
Short copyright string for this version of Emacs.")
-(defconst emacs-version "23.1.94" "\
+(defconst emacs-version "23.1.95" "\
Version numbers of this version of Emacs.")
(defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
View Lorry Controller Status