Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99386. ------------------------------------------------------------ revno: 99386 committer: Dan Nicolaescu branch nick: trunk timestamp: Mon 2010-01-25 23:22:25 -0800 message: (vc-path): Mark as obsolete. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-25 09:04:59 +0000 +++ lisp/ChangeLog 2010-01-26 07:22:25 +0000 @@ -1,3 +1,7 @@ +2010-01-26 Dan Nicolaescu + + * vc-hooks.el (vc-path): Mark as obsolete. + 2010-01-25 Dan Nicolaescu * vc-annotate.el (vc-annotate-revision-at-line): Compare file === modified file 'lisp/vc-hooks.el' --- lisp/vc-hooks.el 2010-01-13 08:35:10 +0000 +++ lisp/vc-hooks.el 2010-01-26 07:22:25 +0000 @@ -89,6 +89,8 @@ :type '(repeat directory) :group 'vc) +(make-obsolete 'vc-path "should not be necessary anymore." "23.2") + (defcustom vc-make-backup-files nil "If non-nil, backups of registered files are made as with other files. If nil (the default), files covered by version control don't get backups." ------------------------------------------------------------ revno: 99385 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-01-25 13:49:23 -0500 message: Fix erc reconnection via non-default connectors (Bug#4958). * erc-backend.el (erc-session-connector): New var. (erc-server-reconnect): Use it to reconnect via old connector (Bug#4958). * erc.el (erc-determine-parameters): Save erc-server-connect-function to erc-session-connector. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2010-01-13 08:35:10 +0000 +++ lisp/erc/ChangeLog 2010-01-25 18:49:23 +0000 @@ -1,3 +1,12 @@ +2010-01-25 Vivek Dasmohapatra + + * erc-backend.el (erc-session-connector): New var. + (erc-server-reconnect): Use it to reconnect via old + connector (Bug#4958). + + * erc.el (erc-determine-parameters): Save + erc-server-connect-function to erc-session-connector. + 2009-11-03 Stefan Monnier * erc.el (erc-display-line-1, erc-process-away): === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2010-01-13 08:35:10 +0000 +++ lisp/erc/erc-backend.el 2010-01-25 18:49:23 +0000 @@ -130,6 +130,10 @@ "The server name used to connect to for this session.") (make-variable-buffer-local 'erc-session-server) +(defvar erc-session-connector nil + "The function used to connect to this session (nil for the default).") +(make-variable-buffer-local 'erc-session-connector) + (defvar erc-session-port nil "The port used to connect to.") (make-variable-buffer-local 'erc-session-port) @@ -538,8 +542,10 @@ (erc-set-active-buffer (current-buffer)) (setq erc-server-last-sent-time 0) (setq erc-server-lines-sent 0) - (erc-open erc-session-server erc-session-port erc-server-current-nick - erc-session-user-full-name t erc-session-password)))) + (let ((erc-server-connect-function (or erc-session-connector + 'open-network-stream))) + (erc-open erc-session-server erc-session-port erc-server-current-nick + erc-session-user-full-name t erc-session-password))))) (defun erc-server-filter-function (process string) "The process filter for the ERC server." === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2010-01-13 08:35:10 +0000 +++ lisp/erc/erc.el 2010-01-25 18:49:23 +0000 @@ -5654,11 +5654,13 @@ "Determine the connection and authentication parameters. Sets the buffer local variables: +- `erc-session-connector' - `erc-session-server' - `erc-session-port' - `erc-session-full-name' - `erc-server-current-nick'" - (setq erc-session-server (erc-compute-server server) + (setq erc-session-connector erc-server-connect-function + erc-session-server (erc-compute-server server) erc-session-port (or port erc-default-port) erc-session-user-full-name (erc-compute-full-name name)) (erc-set-current-nick (erc-compute-nick nick))) ------------------------------------------------------------ revno: 99384 committer: Dan Nicolaescu branch nick: trunk timestamp: Mon 2010-01-25 01:04:59 -0800 message: (vc-annotate-revision-at-line): Compare file names too. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-25 06:03:23 +0000 +++ lisp/ChangeLog 2010-01-25 09:04:59 +0000 @@ -1,5 +1,8 @@ 2010-01-25 Dan Nicolaescu + * vc-annotate.el (vc-annotate-revision-at-line): Compare file + names too. + * vc-bzr.el (vc-bzr-print-log): Use the more compact --line option for the short log. (vc-bzr-log-view-mode): Adjust regexp for the above change. === modified file 'lisp/vc-annotate.el' --- lisp/vc-annotate.el 2010-01-13 08:35:10 +0000 +++ lisp/vc-annotate.el 2010-01-25 09:04:59 +0000 @@ -447,7 +447,8 @@ (let ((rev-at-line (vc-annotate-extract-revision-at-line))) (if (not rev-at-line) (message "Cannot extract revision number from the current line") - (if (equal (car rev-at-line) vc-annotate-parent-rev) + (if (and (equal (car rev-at-line) vc-annotate-parent-rev) + (string= (cdr rev-at-line) vc-annotate-parent-file)) (message "Already at revision %s" rev-at-line) (vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line))))))) ------------------------------------------------------------ revno: 99383 [merge] committer: Jan D. branch nick: trunk timestamp: Mon 2010-01-25 08:46:15 +0100 message: * xfns.c (Fx_create_frame): If frame height is too big, try sizes 24 and 10. Bug #3643. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-25 02:52:03 +0000 +++ src/ChangeLog 2010-01-25 07:45:12 +0000 @@ -1,3 +1,8 @@ +2010-01-25 Jan Djärv + + * xfns.c (Fx_create_frame): If frame height is too big, try + sizes 24 and 10. Bug #3643. + 2010-01-24 Stefan Monnier Try and fix bug#788, hopefully for real this time. === modified file 'src/xfns.c' --- src/xfns.c 2010-01-15 17:04:14 +0000 +++ src/xfns.c 2010-01-25 07:43:10 +0000 @@ -3518,27 +3518,35 @@ window_prompting = x_figure_window_size (f, parms, 1); /* Don't make height higher than display height unless the user asked - for it. */ + for it. Try sizes 24 and 10 if current is too large. */ height = FRAME_LINES (f); tem = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER); if (EQ (tem, Qunbound)) { - int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f)); + int h = FRAME_LINES (f) + FRAME_TOOL_BAR_LINES (f) + + FRAME_MENU_BAR_LINES (f) + 2; + int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h); int dph = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)); + static int tryheight[] = { 24, 10, 0 } ; + int i; + + ph += (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0) /* Gtk toolbar size */ + + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0); /* Arbitrary */ + /* Some desktops have fixed menus above and/or panels below. Try to figure out the usable size we have for emacs. */ current_desktop = x_get_current_desktop (f); x_get_desktop_workarea (f, current_desktop, &deskw, &deskh); if (deskh > 0 && deskh < dph) dph = deskh; - if (ph > dph) + /* Allow 40 pixels for manager decorations. */ + for (i = 0; ph+40 > dph && tryheight[i] != 0; ++i) { - height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, dph) - - FRAME_TOOL_BAR_LINES (f) - FRAME_MENU_BAR_LINES (f); - if (FRAME_EXTERNAL_TOOL_BAR (f)) - height -= 2; /* We can't know how big it will be. */ - if (FRAME_EXTERNAL_MENU_BAR (f)) - height -= 2; /* We can't know how big it will be. */ + height = tryheight[i]; + h = height + FRAME_TOOL_BAR_LINES (f) + FRAME_MENU_BAR_LINES (f) + 2; + ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h) + + (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0) + + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0); } } ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.