# HG changeset patch # User Miles Bader # Date 1205110187 0 # Node ID d999f30304bc4c2b83d0027918cdbbcc71a5e20f # Parent 0574109ed8bc65b7dd1c99aaed29dc15fca0f9e4# Parent 825be512e2e65098370415f049d2d40f5cb5d832 Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1095 diff -r 0574109ed8bc -r d999f30304bc etc/AUTHORS --- a/etc/AUTHORS Sun Mar 09 21:37:16 2008 +0000 +++ b/etc/AUTHORS Mon Mar 10 00:49:47 2008 +0000 @@ -39,8 +39,8 @@ Alakazam Petrofsky: changed hanoi.el Alan Mackenzie: wrote cc-awk.el -and changed cc-cmds.el cc-engine.el cc-mode.el cc-defs.el cc-vars.el - cc-langs.el cc-mode.texi cc-styles.el cc-align.el cc-fonts.el lread.c +and changed cc-cmds.el cc-mode.el cc-engine.el cc-defs.el cc-langs.el + cc-vars.el cc-mode.texi cc-styles.el cc-fonts.el cc-align.el lread.c programs.texi cc-subword.el isearch.el lisp.el search.texi startup.el subr.el text.texi buffers.texi bytecomp.el and 20 other files @@ -225,6 +225,8 @@ Bill Mann: changed configure.in unexaix.c ibmrs6000.h usg5-4-3.h +Bill Meier: changed sh-script.el + Bill Pringlemeir: changed messcompat.el Bill Richter: changed fill.el quail.el ccl.el encoded-kb.el fontset.el @@ -342,10 +344,10 @@ Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el url-file.el url-handlers.el url-http.el url-nfs.el -Chong Yidong: changed cus-edit.el files.el simple.el longlines.el xdisp.c - display.texi custom.el files.texi image-mode.el info.el keyboard.c +Chong Yidong: changed files.el cus-edit.el simple.el xdisp.c longlines.el + display.texi custom.el files.texi image-mode.el keyboard.c info.el compile.el custom.texi text.texi xterm.c frames.texi image.c mouse.el - misc.texi startup.el wid-edit.el and 301 other files + misc.texi startup.el wid-edit.el and 302 other files Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el @@ -407,7 +409,7 @@ Daiki Ueno: wrote pgg-def.el pgg-gpg.el pgg-parse.el pgg-pgp.el pgg-pgp5.el pgg.el starttls.el and changed gnus-sum.el mml2015.el faces.el gnus-agent.el gnus-srvr.el - message.texi mml1991.el pgg.texi + message.texi mml1991.el pgg.texi utf-7.el Dale Gulledge: changed TUTORIAL.eo @@ -426,10 +428,10 @@ gnus-group.el gnus-registry.el gnus-score.el nndoc.el nnmail.el Dan Nicolaescu: wrote iris-ansi.el romanian.el -and changed xterm.el term.el hideshow.el vc-hg.el files.el isearch.el - sh-script.el icon.el lisp.h vc.el verilog-mode.el cus-edit.el faces.el - font-lock.el grep.el diff-mode.el eterm-color.ti ibuffer.el replace.el - rxvt.el term.c and 187 other files +and changed xterm.el term.el hideshow.el vc-hg.el verilog-mode.el + files.el isearch.el sh-script.el icon.el lisp.h vc.el cus-edit.el + faces.el font-lock.el grep.el diff-mode.el eterm-color.ti ibuffer.el + replace.el rxvt.el term.c and 191 other files Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el rcirc.el @@ -874,7 +876,7 @@ calendar.texi COPYING appt.el Makefile.in files.el sh-script.el timeclock.el cal-menu.el configure.in simple.el tex-mode.el calc.texi complete.el fr-refcard.tex orgcard.tex programs.texi startup.el - and 247 other files + and 249 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -1083,8 +1085,8 @@ Jason Rumney: wrote w32-vars.el and changed w32fns.c w32term.c w32menu.c w32-win.el makefile.w32-in w32term.h w32.c w32bdf.c w32-fns.el w32proc.c w32select.c w32console.c - mule-cmds.el w32gui.h keyboard.c emacs.c fileio.c nmake.defs w32bdf.h - w32inevt.c xdisp.c and 93 other files + mule-cmds.el w32gui.h keyboard.c emacs.c fileio.c files.el nmake.defs + w32bdf.h w32inevt.c and 94 other files Jay Belanger: changed calc.texi calc.el calc-ext.el calc-embed.el calc-aent.el calc-prog.el calc-arith.el calc-help.el calc-lang.el @@ -1258,7 +1260,7 @@ cal-menu.el calendar.el compile.el desktop.el diary-lib.el erc-bbdb.el erc-button.el erc-complete.el erc-fill.el erc-ibuffer.el erc-list.el erc-match.el erc-menu.el erc-nets.el erc-replace.el erc-speak.el - and 11 other files + and 12 other files John Williams: changed etags.el @@ -1311,9 +1313,9 @@ and changed files.el perl-mode.el Juanma Barranquero: changed makefile.w32-in subr.el faces.el files.el - help-fns.el bs.el w32fns.c buffer.c simple.el emacsclient.c replace.el - eval.c org.el desktop.el idlwave.el ido.el process.c vhdl-mode.el - window.c xdisp.c allout.el and 658 other files + help-fns.el bs.el w32fns.c buffer.c simple.el desktop.el emacsclient.c + replace.el eval.c org.el idlwave.el ido.el process.c vhdl-mode.el + window.c xdisp.c allout.el and 660 other files Juergen Hoetzel: changed url-handlers.el @@ -1328,8 +1330,8 @@ Jure Cuhalev: changed ispell.el Juri Linkov: changed info.el simple.el isearch.el replace.el compile.el - faces.el display.texi grep.el descr-text.el cus-edit.el dired.el - dired-aux.el edebug.el startup.el compare-w.el desktop.el files.el + faces.el display.texi grep.el descr-text.el cus-edit.el startup.el + dired.el dired-aux.el edebug.el compare-w.el desktop.el files.el lisp-mode.el lisp.el man.el menu-bar.el and 224 other files Justin Sheehy: changed gnus-sum.el nntp.el @@ -2225,7 +2227,7 @@ and changed gnus-art.el gnus.texi message.el gnus-sum.el gnus.el gnus-group.el gnus-faq.texi mm-util.el gnus-start.el gnus-util.el message.texi mml.el gnus-score.el gnus-agent.el gnus-msg.el spam.el - files.el spam-report.el mm-decode.el nnmail.el nnweb.el + files.el nnmail.el spam-report.el mm-decode.el nnweb.el and 168 other files Remek Trzaska: changed gnus-ems.el @@ -2470,7 +2472,7 @@ diff-mode.el log-edit.el log-view.el pcvs-defs.el pcvs-info.el pcvs-parse.el pcvs-util.el reveal.el smerge-mode.el vc-mtn.el and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h - keyboard.c tex-mode.el fill.el keymap.c vc-hooks.el compile.el + keyboard.c fill.el tex-mode.el keymap.c vc-hooks.el compile.el simple.el files.el alloc.c easy-mmode.el regex.c syntax.c info.el xdisp.c sh-script.el and 528 other files @@ -2580,7 +2582,7 @@ and changed spam.el gnus.el gnus-sum.el nnmail.el gnus-start.el spam-stat.el gnus.texi lpath.el nnbabyl.el nnfolder.el nnimap.el nnmbox.el nnmh.el nnml.el replace.el simple.el basic.texi building.texi - commands.texi compile.el dig.el and 12 other files + commands.texi compile.el dig.el and 13 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h @@ -2694,9 +2696,11 @@ Ulrich Leodolter: changed w32proc.c Ulrich Mueller: changed gud.el ChgPane.c ChgSel.c Makefile.in - XMakeAssoc.c case-table.el files.el fortran.el iso-acc.el + XMakeAssoc.c bibtex.el case-table.el files.el fortran.el iso-acc.el msdog-xtra.texi simple.el sysdep.c +Ulrich Neumerkel: changed xterm.c + Ulrik Vieth: wrote meta-mode.el and changed files.el @@ -2795,7 +2799,7 @@ Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h macmenu.c macgui.h image.c macselect.c xdisp.c keyboard.c emacs.c makefile.MPW config.h INSTALL Makefile.in macos.texi darwin.h - unexmacosx.c xfaces.c dispnew.c and 79 other files + unexmacosx.c xfaces.c dispnew.c and 80 other files Yann Dirson: changed imenu.el @@ -2809,6 +2813,8 @@ Yoshinori Koseki: changed fontset.el +Yuri Shtil: changed etags.c + Yutaka Niibe: changed indent.c xdisp.c configure.in Makefile.in dispnew.c sysdep.c config.in dired.el emacs.c fill.el fns.c gmalloc.c gnu-linux.h indent.h process.c simple.el term.c window.c diff -r 0574109ed8bc -r d999f30304bc etc/NEWS.22 --- a/etc/NEWS.22 Sun Mar 09 21:37:16 2008 +0000 +++ b/etc/NEWS.22 Mon Mar 10 00:49:47 2008 +0000 @@ -42,8 +42,31 @@ ** Support for GNU/kFreeBSD (GNU userland and FreeBSD kernel) was added. +** Deprecated machine types and operating systems + +Certain machine types and operating systems have been deprecated. On +these systems, configure will print a warning and exit, and you must +edit the configure script for compilation to proceed. The deprecated +systems will not be supported at all in Emacs 23. We are not aware of +anyone running Emacs on these systems; if you are, please email +emacs-devel@gnu.org to take it off the list of deprecated systems. + +*** Deprecated machine types +pmax, hp9000s300, ibm370aix, ncr386, ews4800, mips-siemens, powerpcle, +and tandem-s2 + +*** Deprecated operating systems +bsd386, bsdos2-1, bsdos2, bsdos3, bsdos4, bsd4-1, bsd4-2, bsd4-3, +usg5-0, usg5-2-2, usg5-2, usg5-3, ultrix4-3, 386bsd, hpux, hpux8, +hpux9, hpux9shr, hpux10, hpux10-20, aix3-1, aix3-2-5, aix3-2, aix4-1, +nextstep, ux4800, uxpds, and uxpv + * Changes in Emacs 22.2 +** `describe-project' is renamed to `describe-gnu-project'. + +** `view-todo' is renamed to `view-emacs-todo'. + ** `find-name-dired' now uses -iname rather than -name for case-insensitive filesystems. The default behavior is determined by the value of `read-file-name-completion-ignore-case'; if you don't @@ -114,7 +137,7 @@ *** VC backends can provide completion of revision names. -*** VC backends can provide extra menu entries to be added to the "Version Control" menu. +*** VC backends can provide extra menu entries to the "Version Control" menu. This can be used to add menu entries for backend specific functions. *** VC has some support for Mercurial (Hg). @@ -145,7 +168,6 @@ ** The function invisible-p returns non-nil if the character after a specified position is invisible. -+++ ** inhibit-modification-hooks is bound to t while running modification hooks. As a happy consequence, after-change-functions and before-change-functions are not bound to nil any more while running an (after|before)-change-function. @@ -166,14 +188,6 @@ (For some separator/string combinations, the original strings cannot be recovered.) -* Systems that will not be supported in the future -configure will print a warning and exit for a set of systems that are -believed to not be in use anymore. The support has not been removed -yet, but configure will need to be edited in order to allow -compilation to proceed on such a system. If you are using such a -system, please send a message to emacs-devel@gnu.org in order to take -off the list of systems. - * Installation Changes in Emacs 22.1 diff -r 0574109ed8bc -r d999f30304bc lisp/ChangeLog --- a/lisp/ChangeLog Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/ChangeLog Mon Mar 10 00:49:47 2008 +0000 @@ -1,3 +1,43 @@ +2008-03-06 Kim F. Storm + + * help.el (view-emacs-todo, describe-gnu-project): Define obsolete + function aliases for the old names. + +2008-03-05 Juanma Barranquero + + * iswitchb.el (iswitchb-use-faces): Doc fix. + (iswitchb-buffer-ignore, iswitchb-read-buffer): Fix typos in + docstrings. + +2008-03-03 Dan Nicolaescu + + * progmodes/verilog-mode.el (verilog-highlight-grouping-keywords): + Fix typo. + (verilog-type-font-keywords): Reindent. + +2008-03-03 Michael McNamara + + * verilog-mode.el (verilog-font-grouping-keywords): Fix bug in the + grouping-keyword regular expression. + (verilog-font-lock-keywords): Allow users to toggle special + highlight of grouping-keywords. + (verilog-highlight-grouping-keywords): The toggle for special + highlighting of grouping keywords. + +2008-03-02 Juri Linkov + + * startup.el: Revert 2008-02-28 change that adds initial message + to *scratch* buffer regardless of the value of + `inhibit-startup-screen'. + +2008-03-01 Dan Nicolaescu + + * textmodes/css-mode.el (css-indent-offset, css-electric-keys): + * textmodes/bibtex-style.el (bibtex-style-indent-basic): + * progmodes/verilog-mode.el (verilog-mode): + * net/socks.el (socks): + * vc-mtn.el (vc-mtn-mode-line-rewrite): Add :version. + 2008-03-09 Stefan Monnier * doc-view.el (bookmark-buffer-file-name, bookmark-prop-get): Declare. diff -r 0574109ed8bc -r d999f30304bc lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/gnus/ChangeLog Mon Mar 10 00:49:47 2008 +0000 @@ -1,9 +1,14 @@ 2008-03-07 Karl Fogel - * lisp/gnus/gnus-bookmark.el: Adjust for renames in bookmark.el. + * gnus-bookmark.el: Adjust for renames in bookmark.el. (gnus-bookmark-make-record): Was `gnus-bookmark-make-cell'. (gnus-bookmark-jump): Adjust some variable names. +2008-03-05 Reiner Steib + + * gnus-sum.el (gnus-print-buffer): Honor ps-print-color-p. + Suggested by . + 2008-03-05 Glenn Morris * gnus-art.el (gnus-article-mode-line-format-alist): Move to gnus-sum. @@ -144,9 +149,9 @@ 2008-02-11 Reiner Steib * gnus-topic.el (gnus-topic-select-group, gnus-topic-read-group): - Document negativ prefix. - - * gnus-group.el (gnus-group-read-group): Document negativ prefix. + Document negative prefix. + + * gnus-group.el (gnus-group-read-group): Document negative prefix. 2008-02-10 Lars Magne Ingebrigtsen diff -r 0574109ed8bc -r d999f30304bc lisp/gnus/gnus-sum.el --- a/lisp/gnus/gnus-sum.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/gnus/gnus-sum.el Mon Mar 10 00:49:47 2008 +0000 @@ -9277,7 +9277,7 @@ (mail-header-date gnus-current-headers) ")")))) (gnus-run-hooks 'gnus-ps-print-hook) (save-excursion - (if window-system + (if ps-print-color-p (ps-spool-buffer-with-faces) (ps-spool-buffer))))) (kill-buffer buffer)))) diff -r 0574109ed8bc -r d999f30304bc lisp/help.el --- a/lisp/help.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/help.el Mon Mar 10 00:49:47 2008 +0000 @@ -315,6 +315,8 @@ (interactive) (view-help-file "THE-GNU-PROJECT")) +(define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2") + (defun describe-no-warranty () "Display info on all the kinds of warranty Emacs does NOT have." (interactive) @@ -418,6 +420,9 @@ (interactive "P") (view-help-file "TODO")) +(define-obsolete-function-alias 'view-todo 'view-emacs-todo "22.2") + + (defun view-echo-area-messages () "View the log of recent echo-area messages: the `*Messages*' buffer. The number of messages retained in that buffer diff -r 0574109ed8bc -r d999f30304bc lisp/iswitchb.el --- a/lisp/iswitchb.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/iswitchb.el Mon Mar 10 00:49:47 2008 +0000 @@ -270,7 +270,7 @@ "*List of regexps or functions matching buffer names to ignore. For example, traditional behavior is not to list buffers whose names begin with a space, for which the regexp is `^ '. See the source file for -example functions that filter buffernames." +example functions that filter buffer names." :type '(repeat (choice regexp function)) :group 'iswitchb) (put 'iswitchb-buffer-ignore 'risky-local-variable t) @@ -354,7 +354,7 @@ :group 'iswitchb) (defcustom iswitchb-use-faces t - "*Non-nil means use font-lock fonts for showing first match." + "*Non-nil means use font-lock faces for showing first match." :type 'boolean :group 'iswitchb) (define-obsolete-variable-alias 'iswitchb-use-fonts 'iswitchb-use-faces "22.1") @@ -606,7 +606,7 @@ PROMPT is the prompt to give to the user. DEFAULT if given is the default buffer to be selected, which will go to the front of the list. -If REQUIRE-MATCH is non-nil, an existing-buffer must be selected. +If REQUIRE-MATCH is non-nil, an existing buffer must be selected. If START is a string, the selection process is started with that string. If MATCHES-SET is non-nil, the buflist is not updated before diff -r 0574109ed8bc -r d999f30304bc lisp/net/socks.el --- a/lisp/net/socks.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/net/socks.el Mon Mar 10 00:49:47 2008 +0000 @@ -100,6 +100,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defgroup socks nil "SOCKS Support" + :version "22.2" :prefix "socks-" :group 'processes) diff -r 0574109ed8bc -r d999f30304bc lisp/newcomment.el --- a/lisp/newcomment.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/newcomment.el Mon Mar 10 00:49:47 2008 +0000 @@ -677,7 +677,7 @@ ;;;###autoload (defun comment-kill (arg) - "Kill the comment on this line, if any. + "Kill the first comment on this line, if any. With prefix ARG, kill comments on that many lines starting with this one." (interactive "P") (comment-normalize-vars) diff -r 0574109ed8bc -r d999f30304bc lisp/progmodes/verilog-mode.el --- a/lisp/progmodes/verilog-mode.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/progmodes/verilog-mode.el Mon Mar 10 00:49:47 2008 +0000 @@ -115,9 +115,9 @@ ;;; Code: ;; This variable will always hold the version number of the mode -(defconst verilog-mode-version "399" +(defconst verilog-mode-version "404" "Version of this Verilog mode.") -(defconst verilog-mode-release-date "2008-02-19-GNU" +(defconst verilog-mode-release-date "2008-03-02-GNU" "Release date of this Verilog mode.") (defconst verilog-mode-release-emacs t "If non-nil, this version of Verilog mode was released with Emacs itself.") @@ -276,6 +276,7 @@ (defgroup verilog-mode nil "Facilitates easy editing of Verilog source text." + :version "22.2" :group 'languages) ; (defgroup verilog-mode-fonts nil @@ -530,6 +531,15 @@ :type 'boolean) (put 'verilog-highlight-p1800-keywords 'safe-local-variable 'verilog-booleanp) +(defcustom verilog-highlight-grouping-keywords nil + "*True means highlight grouping keywords 'begin' and 'end' more dramatically. +If false, these words are in the font-lock-type-face; if True then they are in +`verilog-font-lock-ams-face'. Some find that special highlighting on these +grouping constructs allow the structure of the code to be understood at a glance." + :group 'verilog-mode-indent + :type 'boolean) +(put 'verilog-highlight-grouping-keywords 'safe-local-variable 'verilog-booleanp) + (defcustom verilog-auto-endcomments t "*True means insert a comment /* ... */ after 'end's. The name of the function or case will be set between the braces." @@ -1898,13 +1908,16 @@ ;; Fontify all builtin keywords (concat "\\<\\(" verilog-font-keywords "\\|" ;; And user/system tasks and functions - "\\$[a-zA-Z][a-zA-Z0-9_\\$]*" - "\\)\\>") + "\\$[a-zA-Z][a-zA-Z0-9_\\$]*" + "\\)\\>") ;; Fontify all types - (cons (concat "\\(\\<" verilog-font-grouping-keywords "\\)\\>") - 'verilog-font-lock-ams-face) - (cons (concat "\\<\\(" verilog-type-font-keywords "\\)\\>") - 'font-lock-type-face) + (if verilog-highlight-grouping-keywords + (cons (concat "\\<\\(" verilog-font-grouping-keywords "\\)\\>") + 'verilog-font-lock-ams-face) + (cons (concat "\\<\\(" verilog-font-grouping-keywords "\\)\\>") + 'font-lock-type-face)) + (cons (concat "\\<\\(" verilog-type-font-keywords "\\)\\>") + 'font-lock-type-face) ;; Fontify IEEE-P1800 keywords appropriately (if verilog-highlight-p1800-keywords (cons (concat "\\<\\(" verilog-p1800-keywords "\\)\\>") diff -r 0574109ed8bc -r d999f30304bc lisp/startup.el --- a/lisp/startup.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/startup.el Mon Mar 10 00:49:47 2008 +0000 @@ -56,6 +56,7 @@ (defcustom inhibit-startup-screen nil "Non-nil inhibits the startup screen. +It also inhibits display of the initial message in the `*scratch*' buffer. This is for use in your personal init file (but NOT site-start.el), once you are familiar with the contents of the startup screen." @@ -1154,7 +1155,9 @@ ") "Initial message displayed in *scratch* buffer at startup. -If this is nil, no message will be displayed." +If this is nil, no message will be displayed. +If `inhibit-startup-screen' is non-nil, then no message is displayed, +regardless of the value of this variable." :type '(choice (text :tag "Message") (const :tag "none" nil)) :group 'initialization) @@ -2239,6 +2242,14 @@ ;; (with-no-warnings ;; (setq menubar-bindings-done t)) + ;; If *scratch* exists and is empty, insert initial-scratch-message. + (and initial-scratch-message + (get-buffer "*scratch*") + (with-current-buffer "*scratch*" + (when (zerop (buffer-size)) + (insert initial-scratch-message) + (set-buffer-modified-p nil)))) + (if (> file-count 0) (display-startup-screen t) (display-startup-screen nil))))) diff -r 0574109ed8bc -r d999f30304bc lisp/textmodes/bibtex-style.el --- a/lisp/textmodes/bibtex-style.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/textmodes/bibtex-style.el Mon Mar 10 00:49:47 2008 +0000 @@ -95,6 +95,7 @@ (defcustom bibtex-style-indent-basic 2 "Basic amount of indentation to use in BibTeX Style mode." + :version "22.2" :type 'integer :group 'bibtex) diff -r 0574109ed8bc -r d999f30304bc lisp/textmodes/css-mode.el --- a/lisp/textmodes/css-mode.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/textmodes/css-mode.el Mon Mar 10 00:49:47 2008 +0000 @@ -177,6 +177,7 @@ (defcustom css-electric-keys '(?\} ?\;) ;; '() "Self inserting keys which should trigger re-indentation." + :version "22.2" :type '(repeat character) :options '((?\} ?\;)) :group 'css) @@ -399,6 +400,7 @@ (defcustom css-indent-offset 4 "Basic size of one indentation step." + :version "22.2" :type 'integer :group 'css) diff -r 0574109ed8bc -r d999f30304bc lisp/vc-mtn.el --- a/lisp/vc-mtn.el Sun Mar 09 21:37:16 2008 +0000 +++ b/lisp/vc-mtn.el Mon Mar 10 00:49:47 2008 +0000 @@ -110,6 +110,7 @@ '(("\\`[^:/#]*[:/#]" . "")) ;Drop the host part. "Rewrite rules to shorten Mtn's revision names on the mode-line." :type '(repeat (cons regexp string)) + :version "22.2" :group 'vc) (defun vc-mtn-mode-line-string (file) diff -r 0574109ed8bc -r d999f30304bc src/ChangeLog --- a/src/ChangeLog Sun Mar 09 21:37:16 2008 +0000 +++ b/src/ChangeLog Mon Mar 10 00:49:47 2008 +0000 @@ -1,3 +1,18 @@ +2008-03-07 Stefan Monnier + + * fileio.c (Fsubstitute_in_file_name): Fix up computation of maximum + size of resulting string. + +2008-03-05 Jason Rumney + + * dispnew.c (adjust_glyph_matrix): Initialize window_height. + +2008-03-03 YAMAMOTO Mitsuharu + + * xdisp.c (handle_single_display_spec): Undo 2007-10-16 changes. + Don't pretend as if characters with display property haven't been + consumed for string-replacing-string case. + 2008-03-08 Kim F. Storm * xdisp.c (GET_NEXT_DISPLAY_ELEMENT): New macro. diff -r 0574109ed8bc -r d999f30304bc src/dispnew.c --- a/src/dispnew.c Sun Mar 09 21:37:16 2008 +0000 +++ b/src/dispnew.c Mon Mar 10 00:49:47 2008 +0000 @@ -633,7 +633,7 @@ int header_line_changed_p = 0; int header_line_p = 0; int left = -1, right = -1; - int window_width = -1, window_height; + int window_width = -1, window_height = -1; /* See if W had a header line that has disappeared now, or vice versa. Get W's size. */ diff -r 0574109ed8bc -r d999f30304bc src/fileio.c --- a/src/fileio.c Sun Mar 09 21:37:16 2008 +0000 +++ b/src/fileio.c Mon Mar 10 00:49:47 2008 +0000 @@ -2224,8 +2224,8 @@ /* Get variable value */ o = (unsigned char *) egetenv (target); if (o) - { - total += strlen (o); + { /* Eight-bit chars occupy upto 2 bytes in multibyte. */ + total += strlen (o) * (STRING_MULTIBYTE (filename) ? 2 : 1); substituted = 1; } else if (*p == '}') diff -r 0574109ed8bc -r d999f30304bc src/xdisp.c --- a/src/xdisp.c Sun Mar 09 21:37:16 2008 +0000 +++ b/src/xdisp.c Mon Mar 10 00:49:47 2008 +0000 @@ -4331,15 +4331,13 @@ `display' property yet. The call to pop_it in set_iterator_to_next will clean this up. */ if (BUFFERP (object)) - it->current.pos = start_pos; + *position = start_pos; } else if (CONSP (value) && EQ (XCAR (value), Qspace)) { it->method = GET_FROM_STRETCH; it->object = value; - it->position = start_pos; - if (BUFFERP (object)) - it->current.pos = start_pos; + *position = it->position = start_pos; } #ifdef HAVE_WINDOW_SYSTEM else @@ -4353,8 +4351,7 @@ /* Say that we haven't consumed the characters with `display' property yet. The call to pop_it in set_iterator_to_next will clean this up. */ - if (BUFFERP (object)) - it->current.pos = start_pos; + *position = start_pos; } #endif /* HAVE_WINDOW_SYSTEM */