Mercurial > emacs
changeset 108335:e62a3bc4cbef
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 18 Apr 2010 22:41:26 +0000 |
| parents | 418153f9c105 (current diff) 34a427c407fe (diff) |
| children | d7b6f0f1d150 |
| files | |
| diffstat | 7 files changed, 57 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Fri Apr 16 03:26:07 2010 +0000 +++ b/doc/emacs/ChangeLog Sun Apr 18 22:41:26 2010 +0000 @@ -1,5 +1,7 @@ 2010-04-16 Glenn Morris <rgm@gnu.org> + * emacs.texi (Acknowledgments): Remove duplicate. + * maintaining.texi (VC Directory Commands): Mention stashes and shelves. 2010-04-15 Glenn Morris <rgm@gnu.org>
--- a/doc/emacs/emacs.texi Fri Apr 16 03:26:07 2010 +0000 +++ b/doc/emacs/emacs.texi Sun Apr 18 22:41:26 2010 +0000 @@ -1403,9 +1403,9 @@ Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel, Manuel Serrano, Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris -Smith, David Smith, Paul D.@: Smith, Andre Spiegel, Michael Staats, -William Sommerfeld, Michael Staats, Reiner Steib, Sam Steingold, Ake -Stenhoff, Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan +Smith, David Smith, Paul D.@: Smith, William Sommerfeld, Andre Spiegel, +Michael Staats, Reiner Steib, Sam Steingold, Ake Stenhoff, +Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.@: Storm, Steve Strassman, Olaf Sylvester, Naoto Takahashi, Steven Tamm, Jean-Philippe Theberge, Jens T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Luc Teirlinck,
--- a/etc/NEWS Fri Apr 16 03:26:07 2010 +0000 +++ b/etc/NEWS Sun Apr 18 22:41:26 2010 +0000 @@ -37,8 +37,10 @@ ** `make install' now consistently ignores umask, creating a world-readable install. ++++ ** Emacs compiles with Gconf support, if it is detected. Use the configure option --without-gconf to disable this. +This is used by the `font-use-system-font' feature (see below). * Startup Changes in Emacs 23.2 +++ @@ -440,6 +442,7 @@ +++ ** js.el is a new major mode for JavaScript files. +--- ** imap-hash.el is a new library to address IMAP mailboxes as hashtables.
--- a/lisp/ChangeLog Fri Apr 16 03:26:07 2010 +0000 +++ b/lisp/ChangeLog Sun Apr 18 22:41:26 2010 +0000 @@ -1,3 +1,24 @@ +2010-04-18 Chong Yidong <cyd@stupidchicken.com> + + * cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Don't + destroy list before using it. + +2010-04-17 Dan Nicolaescu <dann@ics.uci.edu> + + Fix the version number for added files. + * vc-hg.el (vc-hg-working-revision): Check if the file is + registered after hg parent fails (Bug#5961). + +2010-04-17 Glenn Morris <rgm@gnu.org> + + * htmlfontify.el (htmlfontify-buffer) + (htmlfontify-copy-and-link-dir): Autoload entry points. + +2010-04-17 Magnus Henoch <magnus.henoch@gmail.com> + + * vc-hg.el (vc-hg-annotate-extract-revision-at-line): Expand file + name relative to the project root (Bug#5960). + 2010-04-16 Glenn Morris <rgm@gnu.org> * vc-git.el (vc-git-print-log): Doc fix.
--- a/lisp/cedet/ede/pmake.el Fri Apr 16 03:26:07 2010 +0000 +++ b/lisp/cedet/ede/pmake.el Sun Apr 18 22:41:26 2010 +0000 @@ -425,10 +425,9 @@ (link (ede-proj-linkers this)) (name (ede-proj-makefile-target-name this)) (src (oref this source))) - (while comp - (ede-compiler-only-once (car comp) - (ede-proj-makefile-insert-variables (car comp))) - (setq comp (cdr comp))) + (dolist (obj comp) + (ede-compiler-only-once obj + (ede-proj-makefile-insert-variables obj))) (ede-proj-makefile-insert-object-variables (car comp) name src) (while link (ede-linker-only-once (car link)
--- a/lisp/htmlfontify.el Fri Apr 16 03:26:07 2010 +0000 +++ b/lisp/htmlfontify.el Sun Apr 18 22:41:26 2010 +0000 @@ -1790,6 +1790,7 @@ (when font-lock-defaults (font-lock-fontify-buffer)) )) +;;;###autoload (defun htmlfontify-buffer (&optional srcdir file) "Create a new buffer, named for the current buffer + a .html extension, containing an inline CSS-stylesheet and formatted CSS-markup HTML @@ -2276,6 +2277,7 @@ (save-buffer) (kill-buffer B))) +;;;###autoload (defun htmlfontify-copy-and-link-dir (srcdir dstdir &optional f-ext l-ext) "Trawl SRCDIR and write fontified-and-hyperlinked output in DSTDIR. F-EXT and L-EXT specify values for `hfy-extn' and `hfy-link-extn'.\n
--- a/lisp/vc-hg.el Fri Apr 16 03:26:07 2010 +0000 +++ b/lisp/vc-hg.el Sun Apr 18 22:41:26 2010 +0000 @@ -196,16 +196,16 @@ (let* ((status nil) (default-directory (file-name-directory file)) + ;; Avoid localization of messages so we can parse the output. + (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") + process-environment)) (out (with-output-to-string (with-current-buffer standard-output (setq status (condition-case nil - (let ((process-environment - ;; Avoid localization of messages so we can parse the output. - (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") - process-environment))) + (let ((process-environment avoid-local-env)) ;; Ignore all errors. (process-file "hg" nil t nil @@ -213,7 +213,23 @@ ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil))))))) - (when (eq 0 status) out))) + (if (eq 0 status) + out + ;; Check if the file is in the 'added state, the above hg + ;; command does not distinguish between 'added and 'unregistered. + (setq status + (condition-case nil + (let ((process-environment avoid-local-env)) + (process-file + "hg" nil nil nil + ;; We use "log" here, if there's a faster command + ;; that returns true for an 'added file and false + ;; for an 'unregistered one, we could use that. + "log" "-l1" (file-relative-name file))) + ;; Some problem happened. E.g. We can't find an `hg' + ;; executable. + (error nil))) + (when (eq 0 status) "0")))) ;;; History functions @@ -340,7 +356,8 @@ (if (match-beginning 3) (match-string-no-properties 1) (cons (match-string-no-properties 1) - (expand-file-name (match-string-no-properties 4))))))) + (expand-file-name (match-string-no-properties 4) + (vc-hg-root default-directory))))))) (defun vc-hg-previous-revision (file rev) (let ((newrev (1- (string-to-number rev))))