Now on revision 105304. ------------------------------------------------------------ revno: 105304 committer: Alan Mackenzie branch nick: trunk timestamp: Fri 2011-07-22 12:53:46 +0000 message: Prevent cc-langs.elc being loaded at run time. cc-mode.el: Remove two autoload forms which loaded cc-langs. cc-langs.el (c-make-init-lang-vars-fun): Don't emit "(require 'cc-langs)". Quote a form so it will evaluate at (cc-mode's) compilation time. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-22 11:04:55 +0000 +++ lisp/ChangeLog 2011-07-22 12:53:46 +0000 @@ -1,3 +1,14 @@ +2011-07-22 Alan Mackenzie + + Prevent cc-langs.elc being loaded at run time. + + * progmodes/cc-mode.el: Remove two autoload forms which loaded + cc-langs. + + * /progmodes/cc-langs.el (c-make-init-lang-vars-fun): Don't emit + "(require 'cc-langs)". Quote a form so it will evaluate at + (cc-mode's) compilation time. + 2011-07-22 Michael Albinus * net/tramp.el (tramp-file-name-handler): Avoid recursive === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2011-07-18 17:15:24 +0000 +++ lisp/progmodes/cc-langs.el 2011-07-22 12:53:46 +0000 @@ -3092,10 +3092,9 @@ ;; ',mode ,c-version c-version) ;; (put ',mode 'c-has-warned-lang-consts t)) - (require 'cc-langs) (setq source-eval t) - (let ((init (append (cdr c-emacs-variable-inits) - (cdr c-lang-variable-inits)))) + (let ((init ',(append (cdr c-emacs-variable-inits) + (cdr c-lang-variable-inits)))) (while init (setq current-var (caar init)) (set (caar init) (eval (cadar init))) === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2011-06-30 20:45:12 +0000 +++ lisp/progmodes/cc-mode.el 2011-07-22 12:53:46 +0000 @@ -120,11 +120,6 @@ ; ' (require 'cc-fonts) ;) -;; cc-langs isn't loaded when we're byte compiled, so add autoload -;; directives for the interface functions. -(autoload 'c-make-init-lang-vars-fun "cc-langs") -(autoload 'c-init-language-vars "cc-langs" nil nil 'macro) - ;; Other modes and packages which depend on CC Mode should do the ;; following to make sure everything is loaded and available for their ------------------------------------------------------------ revno: 105303 committer: Michael Albinus branch nick: trunk timestamp: Fri 2011-07-22 13:04:55 +0200 message: * net/tramp.el (tramp-file-name-handler): Avoid recursive loading. (Bug#9114) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-21 08:27:44 +0000 +++ lisp/ChangeLog 2011-07-22 11:04:55 +0000 @@ -1,3 +1,8 @@ +2011-07-22 Michael Albinus + + * net/tramp.el (tramp-file-name-handler): Avoid recursive + loading. (Bug#9114) + 2011-07-21 Martin Rudalics * window.el (display-buffer-pop-up-window) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2011-07-01 09:14:31 +0000 +++ lisp/net/tramp.el 2011-07-22 11:04:55 +0000 @@ -1876,7 +1876,17 @@ ;; Call the backend function. (if foreign (condition-case err - (apply foreign operation args) + (let ((sf (symbol-function foreign))) + ;; Some packages set the default directory to a + ;; remote path, before respective Tramp packages + ;; are already loaded. This results in + ;; recursive loading. Therefore, we load the + ;; Tramp packages locally. + (when (and (listp sf) (eq (car sf) 'autoload)) + (let ((default-directory + (tramp-compat-temporary-file-directory))) + (load (cadr sf) 'noerror))) + (apply foreign operation args)) ;; Trace that somebody has interrupted the operation. (quit ------------------------------------------------------------ revno: 105302 fixes bug(s): http://debbugs.gnu.org/4238 committer: Chong Yidong branch nick: trunk timestamp: Fri 2011-07-22 01:02:24 -0400 message: Fix --reverse-video on ttys. * src/frame.c (Fmodify_frame_parameters): In tty case, update the default face if necessary. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-21 18:38:21 +0000 +++ src/ChangeLog 2011-07-22 05:02:24 +0000 @@ -1,3 +1,8 @@ +2011-07-22 Chong Yidong + + * frame.c (Fmodify_frame_parameters): In tty case, update the + default face if necessary (Bug#4238). + 2011-07-21 Chong Yidong * editfns.c (Fstring_to_char): No need to explain what a character === modified file 'src/frame.c' --- src/frame.c 2011-06-24 21:25:22 +0000 +++ src/frame.c 2011-07-22 05:02:24 +0000 @@ -2437,11 +2437,9 @@ val = values[i]; store_frame_param (f, prop, val); - /* Changing the background color might change the background - mode, so that we have to load new defface specs. - Call frame-set-background-mode to do that. */ - if (EQ (prop, Qbackground_color)) - call1 (Qframe_set_background_mode, frame); + if (EQ (prop, Qforeground_color) + || EQ (prop, Qbackground_color)) + update_face_from_frame_parameter (f, prop, val); } } return Qnil; ------------------------------------------------------------ revno: 105301 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-07-21 14:38:21 -0400 message: Doc fix for string-to-char (Bug#6576). * editfns.c (Fstring_to_char): No need to explain what a character is in the docstring. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-20 20:45:13 +0000 +++ src/ChangeLog 2011-07-21 18:38:21 +0000 @@ -1,3 +1,8 @@ +2011-07-21 Chong Yidong + + * editfns.c (Fstring_to_char): No need to explain what a character + is in the docstring (Bug#6576). + 2011-07-20 Lars Magne Ingebrigtsen * xml.c (parse_region): Make sure we always return a tree. === modified file 'src/editfns.c' --- src/editfns.c 2011-07-14 13:40:24 +0000 +++ src/editfns.c 2011-07-21 18:38:21 +0000 @@ -194,12 +194,7 @@ } DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0, - doc: /* Return the first character in STRING. -A multibyte character is handled correctly. -The value returned is a Unicode codepoint if it is below #x110000 (in -hex). Codepoints beyond that are Emacs extensions of Unicode. In -particular, eight-bit characters are returned as codepoints in the -range #x3FFF80 through #x3FFFFF, inclusive. */) + doc: /* Return the first character in STRING. */) (register Lisp_Object string) { register Lisp_Object val; ------------------------------------------------------------ revno: 105300 committer: martin rudalics branch nick: trunk timestamp: Thu 2011-07-21 10:27:44 +0200 message: Fix size adjustment calls in display-buffer subroutines. * window.el (display-buffer-pop-up-window) (display-buffer-pop-up-side-window) (display-buffer-in-side-window): Call display-buffer-set-height and display-buffer-set-width after setting the new window's buffer so `fit-window-to-buffer' and friends work on the right buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-20 16:45:00 +0000 +++ lisp/ChangeLog 2011-07-21 08:27:44 +0000 @@ -1,3 +1,12 @@ +2011-07-21 Martin Rudalics + + * window.el (display-buffer-pop-up-window) + (display-buffer-pop-up-side-window) + (display-buffer-in-side-window): Call display-buffer-set-height + and display-buffer-set-width after setting the new window's + buffer so `fit-window-to-buffer' and friends work on the right + buffer. + 2011-07-20 Sam Steingold * progmodes/etags.el (etags-file-of-tag, etags-tags-table-files) === modified file 'lisp/window.el' --- lisp/window.el 2011-07-19 07:05:51 +0000 +++ lisp/window.el 2011-07-21 08:27:44 +0000 @@ -5051,14 +5051,22 @@ (funcall side window))))) (when (window-live-p window) - ;; Adjust sizes if asked for. - (display-buffer-set-height window specifiers) - (display-buffer-set-width window specifiers) + ;; In `quit-restore' parameter record that we popped up + ;; this window, its buffer and which window was selected. (set-window-parameter window 'quit-restore (list 'new-window buffer selected-window)) + ;; For `display-buffer-window' mark window as new. (setq display-buffer-window (cons window 'new-window)) + ;; Install BUFFER in the new window. (display-buffer-in-window buffer window specifiers) + ;; Adjust sizes if asked for (for `fit-window-to-buffer' + ;; and friends BUFFER must be already shown in the new + ;; window). + (display-buffer-set-height window specifiers) + (display-buffer-set-width window specifiers) + ;; Reset list of window's previous buffers to nil. (set-window-prev-buffers window nil) + ;; Return the new window. (throw 'done window)))))))) (defun display-buffer-pop-up-frame (buffer &optional graphic-only specifiers) @@ -5113,26 +5121,33 @@ (display-buffer-split-window main-or-root on-side specifiers)) fun) (when window + ;; We were able to split off a new window. (unless main (walk-window-subtree (lambda (window) ;; Make all main-or-root subwindows main windows. (set-window-parameter window 'window-side 'none)) main-or-root t)) - ;; Make sure that parent's window-side is nil. + ;; Reset window-side parameter of new window's parent to nil. (set-window-parameter (window-parent window) 'window-side nil) - ;; Initialize side. + ;; Initialize window-side parameter of new window to SIDE. (set-window-parameter window 'window-side side) - ;; Adjust sizes if asked for. - (display-buffer-set-height window specifiers) - (display-buffer-set-width window specifiers) - ;; Set window parameters. + ;; Install window-slot parameter of new window. + (set-window-parameter window 'window-slot slot) + ;; In `quit-restore' parameter record that we popped up a new + ;; window. (set-window-parameter window 'quit-restore (list 'new-window buffer selected-window)) + ;; For `display-buffer-window' mark window as new. (setq display-buffer-window (cons window 'new-window)) - (set-window-parameter window 'window-slot slot) + ;; Install BUFFER in new window. (display-buffer-in-window buffer window specifiers) + ;; Adjust sizes of new window if asked for. + (display-buffer-set-height window specifiers) + (display-buffer-set-width window specifiers) + ;; Reset list of new window's previous buffers to nil. (set-window-prev-buffers window nil) + ;; Return the new window. window))) (defun display-buffer-in-side-window (buffer side &optional slot specifiers) @@ -5160,7 +5175,7 @@ window-sides-slots)) (selected-window (selected-window)) window this-window this-slot prev-window next-window - best-window best-slot abs-slot dedicated) + best-window best-slot abs-slot dedicated new-window) (unless (numberp slot) (setq slot 0)) @@ -5233,13 +5248,16 @@ (setq window (display-buffer-split-window prev-window prev-side specifiers))))) (progn - (display-buffer-set-height window specifiers) - (display-buffer-set-width window specifiers) + ;; In `quit-restore' parameter record that we popped up + ;; this window, its buffer and the old selected window. (set-window-parameter window 'quit-restore (list 'new-window buffer selected-window)) + ;; For `display-buffer-window' mark window as new. (setq display-buffer-window (cons window 'new-window)) - window)) + ;; Record that window is new, we need this for + ;; adjusting sizes below. + (setq new-window window))) (and best-window (setq window best-window) ;; Reuse best window (the window nearest to SLOT). @@ -5262,7 +5280,17 @@ (unless (window-parameter window 'window-slot) ;; Don't change exisiting slot value. (set-window-parameter window 'window-slot slot)) - (display-buffer-in-window buffer window specifiers))))) + ;; Install BUFFER in the window. + (display-buffer-in-window buffer window specifiers) + (when new-window + ;; Adjust sizes if asked for (for `fit-window-to-buffer' and + ;; friends BUFFER must be already shown in the new window). + (display-buffer-set-height window specifiers) + (display-buffer-set-width window specifiers) + ;; Reset list of new window's previous buffers to nil. + (set-window-prev-buffers window nil)) + ;; Return the window used. + window)))) (defun window-normalize-buffer-to-display (buffer-or-name) "Normalize BUFFER-OR-NAME argument for buffer display functions. @@ -6926,7 +6954,7 @@ ;; `with-selected-window' should orderly restore the current buffer. (with-selected-window window ;; We are in WINDOW's buffer now. - (let* ( ;; Adjust MIN-HEIGHT. + (let* (;; Adjust MIN-HEIGHT. (min-height (if override (window-min-size window nil window)