Now on revision 107068. ------------------------------------------------------------ revno: 107068 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2012-02-02 22:10:47 +0000 message: nnimap.el (nnimap-retrieve-group-data-early): Don't say we're doing an initial sync unless we're really doing one. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-02 11:07:55 +0000 +++ lisp/gnus/ChangeLog 2012-02-02 22:10:47 +0000 @@ -1,5 +1,8 @@ 2012-02-02 Lars Ingebrigtsen + * nnimap.el (nnimap-retrieve-group-data-early): Don't say we're doing + an initial sync unless we're really doing one. + * gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new address parameter if one already exists (bug#9676). === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2012-02-01 22:06:29 +0000 +++ lisp/gnus/nnimap.el 2012-02-02 22:10:47 +0000 @@ -1244,12 +1244,7 @@ 'qresync nil group 'qresync) sequences) - (let ((start - (if (and active uidvalidity) - ;; Fetch the last 100 flags. - (max 1 (- (cdr active) 100)) - 1)) - (command + (let ((command (if uidvalidity "EXAMINE" ;; If we don't have a UIDVALIDITY, then this is @@ -1257,9 +1252,14 @@ ;; have to do a SELECT (which is slower than an ;; examine), but will tell us whether the group ;; is read-only or not. - "SELECT"))) - (setf (nnimap-initial-resync nnimap-object) - (1+ (nnimap-initial-resync nnimap-object))) + "SELECT")) + start) + (if (and active uidvalidity) + ;; Fetch the last 100 flags. + (setq start (max 1 (- (cdr active) 100))) + (setf (nnimap-initial-resync nnimap-object) + (1+ (nnimap-initial-resync nnimap-object))) + (setq start 1)) (push (list (nnimap-send-command "%s %S" command (utf7-encode group t)) (nnimap-send-command "UID FETCH %d:* FLAGS" start) ------------------------------------------------------------ revno: 107067 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-02 14:13:36 -0500 message: Configure wording tweak. diff: === modified file 'autogen/configure' --- autogen/configure 2012-02-02 11:17:46 +0000 +++ autogen/configure 2012-02-02 19:13:36 +0000 @@ -9839,7 +9839,7 @@ NS_OBJC_OBJ= if test "${HAVE_NS}" = yes; then if test "$with_toolkit_scroll_bars" = "no"; then - as_fn_error "Native scroll bars are not implemented for Nextstep." "$LINENO" 5 + as_fn_error "Non-toolkit scroll bars are not implemented for Nextstep." "$LINENO" 5 fi window_system=nextstep === modified file 'configure.in' --- configure.in 2012-02-02 02:12:57 +0000 +++ configure.in 2012-02-02 19:13:36 +0000 @@ -1569,7 +1569,7 @@ NS_OBJC_OBJ= if test "${HAVE_NS}" = yes; then if test "$with_toolkit_scroll_bars" = "no"; then - AC_MSG_ERROR([Native scroll bars are not implemented for Nextstep.]) + AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for Nextstep.]) fi window_system=nextstep ------------------------------------------------------------ revno: 107066 committer: Michael Albinus branch nick: trunk timestamp: Thu 2012-02-02 13:47:09 +0100 message: * dbusbind.c (Fdbus_register_method): Mention the return value :ignore in the docstring. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-02-02 09:12:08 +0000 +++ src/ChangeLog 2012-02-02 12:47:09 +0000 @@ -1,3 +1,8 @@ +2012-02-02 Michael Albinus + + * dbusbind.c (Fdbus_register_method): Mention the return value + :ignore in the docstring. + 2012-02-02 Glenn Morris * callproc.c (Fcall_process, Fcall_process_region): Doc fix. === modified file 'src/dbusbind.c' --- src/dbusbind.c 2012-01-19 07:21:25 +0000 +++ src/dbusbind.c 2012-02-02 12:47:09 +0000 @@ -2162,10 +2162,13 @@ PATH is the D-Bus object path SERVICE is registered (See discussion of DONT-REGISTER-SERVICE below). INTERFACE is the interface offered by -SERVICE. It must provide METHOD. HANDLER is a Lisp function to be -called when a method call is received. It must accept the input -arguments of METHOD. The return value of HANDLER is used for -composing the returning D-Bus message. +SERVICE. It must provide METHOD. + +HANDLER is a Lisp function to be called when a method call is +received. It must accept the input arguments of METHOD. The return +value of HANDLER is used for composing the returning D-Bus message. +In case HANDLER shall return a reply message with an empty argument +list, HANDLER must return the symbol `:ignore'. When DONT-REGISTER-SERVICE is non-nil, the known name SERVICE is not registered. This means that other D-Bus clients have no way of ------------------------------------------------------------ revno: 107065 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2012-02-02 13:24:30 +0100 message: lisp/ChangeLog: Fix typos. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-02 09:12:08 +0000 +++ lisp/ChangeLog 2012-02-02 12:24:30 +0000 @@ -12,7 +12,7 @@ 2012-02-02 Kenichi Handa - * (compose-region): Cancel previous change. + * composite.el (compose-region): Cancel previous change. 2012-02-02 Kenichi Handa @@ -27,8 +27,8 @@ * frame.el (set-frame-font): Tweak meaning of third argument. - * dynamic-setting.el (font-setting-change-default-font): Use - set-frame-font (Bug#9982). + * dynamic-setting.el (font-setting-change-default-font): + Use set-frame-font (Bug#9982). 2012-02-01 Glenn Morris ------------------------------------------------------------ revno: 107064 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-02-02 06:17:46 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2012-02-01 11:17:54 +0000 +++ autogen/configure 2012-02-02 11:17:46 +0000 @@ -9838,6 +9838,10 @@ NS_OBJ= NS_OBJC_OBJ= if test "${HAVE_NS}" = yes; then + if test "$with_toolkit_scroll_bars" = "no"; then + as_fn_error "Native scroll bars are not implemented for Nextstep." "$LINENO" 5 + fi + window_system=nextstep with_xft=no # set up packaging dirs ------------------------------------------------------------ revno: 107063 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2012-02-02 11:07:55 +0000 message: gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new address parameter if one already exists (bug#9676). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-02 10:38:16 +0000 +++ lisp/gnus/ChangeLog 2012-02-02 11:07:55 +0000 @@ -1,5 +1,8 @@ 2012-02-02 Lars Ingebrigtsen + * gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new + address parameter if one already exists (bug#9676). + * gnus-msg.el (gnus-summary-mail-forward): Respect the process marks, not the prefix, as documented (bug#10689). === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2012-02-01 23:16:56 +0000 +++ lisp/gnus/gnus-group.el 2012-02-02 11:07:55 +0000 @@ -2295,10 +2295,15 @@ (gnus-no-server)) (when (stringp method) (setq method (gnus-server-to-method method))) - (setq method - `(,(car method) ,(concat (cadr method) "-ephemeral") - (,(intern (format "%s-address" (car method))) ,(cadr method)) - ,@(cddr method))) + (let ((address-slot + (intern (format "%s-address" (car method))))) + (setq method + (if (assq address-slot (cddr method)) + `(,(car method) ,(concat (cadr method) "-ephemeral") + ,@(cddr method)) + `(,(car method) ,(concat (cadr method) "-ephemeral") + (,address-slot ,(cadr method)) + ,@(cddr method))))) (let ((group (if (gnus-group-foreign-p group) group (gnus-group-prefixed-name (gnus-group-real-name group) method)))) ------------------------------------------------------------ revno: 107062 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2012-02-02 10:38:16 +0000 message: gnus-msg.el (gnus-summary-mail-forward): Respect the process marks, not the prefix, as documented (bug#10689). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-01 23:22:55 +0000 +++ lisp/gnus/ChangeLog 2012-02-02 10:38:16 +0000 @@ -1,3 +1,8 @@ +2012-02-02 Lars Ingebrigtsen + + * gnus-msg.el (gnus-summary-mail-forward): Respect the process marks, + not the prefix, as documented (bug#10689). + 2012-02-01 Lars Ingebrigtsen * gnus.el (gnus-valid-select-methods): nnmaildir also saves marks in === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-msg.el 2012-02-02 10:38:16 +0000 @@ -1230,7 +1230,7 @@ (interactive "P") (if (cdr (gnus-summary-work-articles nil)) ;; Process marks are given. - (gnus-uu-digest-mail-forward arg post) + (gnus-uu-digest-mail-forward nil post) ;; No process marks. (let ((message-forward-as-mime message-forward-as-mime) (message-forward-show-mml message-forward-show-mml)) ------------------------------------------------------------ revno: 107061 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2012-02-02 18:12:42 +0900 message: Fix previous change for Bug#6988. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-02 07:48:39 +0000 +++ lisp/ChangeLog 2012-02-02 09:12:08 +0000 @@ -12,6 +12,10 @@ 2012-02-02 Kenichi Handa + * (compose-region): Cancel previous change. + +2012-02-02 Kenichi Handa + * composite.el (compose-region, compose-string): Signal error for a null string component (Bug#6988). === modified file 'lisp/composite.el' --- lisp/composite.el 2012-02-02 00:30:09 +0000 +++ lisp/composite.el 2012-02-02 09:07:29 +0000 @@ -211,7 +211,7 @@ If it is a character, it is an alternate character to display instead of the text in the region. -If it is a string, the elements are one or more alternate characters. In +If it is a string, the elements are alternate characters. In this case, TAB element has a special meaning. If the first character is TAB, the glyphs are displayed with left padding space so that no pixel overlaps with the previous column. If the last @@ -234,9 +234,7 @@ (let ((modified-p (buffer-modified-p)) (inhibit-read-only t)) (if (or (vectorp components) (listp components)) - (setq components (encode-composition-components components)) - (if (= (length components) 0) - (error "Invalid composition component: %s" components))) + (setq components (encode-composition-components components))) (compose-region-internal start end components modification-func) (restore-buffer-modified-p modified-p))) @@ -269,9 +267,7 @@ adjust the composition when it gets invalid because of a change of text in the composition." (if (or (vectorp components) (listp components)) - (setq components (encode-composition-components components)) - (if (= (length components) 0) - (error "Invalid composition component: %s" components))) + (setq components (encode-composition-components components))) (or start (setq start 0)) (or end (setq end (length string))) (compose-string-internal string start end components modification-func) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-02-02 07:21:20 +0000 +++ src/ChangeLog 2012-02-02 09:12:08 +0000 @@ -10,6 +10,11 @@ 2012-02-02 Kenichi Handa + (x_produce_glyphs): Cancel previous change. If cmp->glyph_len is + 0, do not call append_composite_glyph. + +2012-02-02 Kenichi Handa + * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to NULL (Bug#6988). (x_produce_glyphs): If the component of a composition is a null === modified file 'src/xdisp.c' --- src/xdisp.c 2012-02-02 00:30:09 +0000 +++ src/xdisp.c 2012-02-02 09:07:29 +0000 @@ -24595,10 +24595,6 @@ it->glyph_row->contains_overlapping_glyphs_p = 1; it->pixel_width = cmp->pixel_width; - if (it->pixel_width == 0) - /* We assure that all visible glyphs have at least 1-pixel - width. */ - it->pixel_width = 1; it->ascent = it->phys_ascent = cmp->ascent; it->descent = it->phys_descent = cmp->descent; if (face->box != FACE_NO_BOX) @@ -24630,7 +24626,7 @@ if (it->descent < 0) it->descent = 0; - if (it->glyph_row) + if (it->glyph_row && cmp->glyph_len > 0) append_composite_glyph (it); } else if (it->what == IT_COMPOSITION) ------------------------------------------------------------ revno: 107060 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-02-01 23:48:39 -0800 message: server.el doc fixes * lisp/server.el (server-auth-dir): Doc fix. (server-eval-at): Doc fix. Give an explicit error if !server-use-tcp. * etc/NEWS: Markup. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-02-02 07:21:20 +0000 +++ etc/NEWS 2012-02-02 07:48:39 +0000 @@ -1237,8 +1237,9 @@ *** New macro `with-wrapper-hook' for running an abnormal hook as a set of "wrapping" filters, similar to around advice. -** `server-eval-at' is provided to allow evaluating forms on different -Emacs server instances. ++++ +** The new function `server-eval-at' allows evaluation of Lisp forms on +named Emacs server instances, using TCP sockets. +++ ** `call-process' and `call-process-region' allow a `(:file "file")' spec === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-02 02:57:26 +0000 +++ lisp/ChangeLog 2012-02-02 07:48:39 +0000 @@ -1,5 +1,8 @@ 2012-02-02 Glenn Morris + * server.el (server-auth-dir): Doc fix. + (server-eval-at): Doc fix. Give an explicit error if !server-use-tcp. + * subr.el (run-mode-hooks): Doc fix. 2012-02-02 Juri Linkov === modified file 'lisp/server.el' --- lisp/server.el 2012-01-19 07:21:25 +0000 +++ lisp/server.el 2012-02-02 07:48:39 +0000 @@ -126,6 +126,8 @@ (defcustom server-auth-dir (locate-user-emacs-file "server/") "Directory for server authentication files. +We only use this if `server-use-tcp' is non-nil. +Otherwise we use `server-socket-dir'. NOTE: On FAT32 filesystems, directories are not secure; files can be read and modified by any user or process. @@ -1525,7 +1527,14 @@ nil) (defun server-eval-at (server form) - "Eval FORM on Emacs Server SERVER." + "Contact the Emacs server named SERVER and evaluate FORM there. +Returns the result of the evaluation, or signals an error if it +cannot contact the specified server. For example: + \(server-eval-at \"server\" '(emacs-pid)) +returns the process ID of the Emacs instance running \"server\". +This function requires the use of TCP sockets. " + (or server-use-tcp + (error "This function requires TCP sockets")) (let ((auth-file (expand-file-name server server-auth-dir)) (coding-system-for-read 'binary) (coding-system-for-write 'binary) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.