Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102047. ------------------------------------------------------------ revno: 102047 committer: Jan D branch nick: trunk timestamp: Fri 2010-10-22 07:49:47 +0200 message: Fix compilation with Motif (Bug#7263). * src/xfns.c: Include Xm/TextF and Xm/List. (file_dialog_cb, file_dialog_unmap_cb, clean_up_file_dialog): Make ANSI prototypes. * src/xmenu.c: Revert 2010-07-27 change: lwlib.h is needed for MOTIF (Bug#7263). * src/xrdb.c: Include keyboard.h for MOTIF. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-22 03:37:20 +0000 +++ src/ChangeLog 2010-10-22 05:49:47 +0000 @@ -1,3 +1,14 @@ +2010-10-22 Jan Djärv + + * xrdb.c: Include keyboard.h for MOTIF. + + * xmenu.c: Revert 2010-07-27 change: lwlib.h is needed for + MOTIF (Bug#7263). + + * xfns.c: Include Xm/TextF and Xm/List. + (file_dialog_cb, file_dialog_unmap_cb, clean_up_file_dialog): Make + ANSI prototypes. + 2010-10-22 Glenn Morris * Makefile.in (SOME_MACHINE_LISP): Add w32-vars. === modified file 'src/xfns.c' --- src/xfns.c 2010-08-13 13:26:13 +0000 +++ src/xfns.c 2010-10-22 05:49:47 +0000 @@ -99,6 +99,8 @@ #include #include #include +#include +#include #endif #ifdef USE_LUCID @@ -5299,9 +5301,7 @@ /* Callback for "OK" and "Cancel" on file selection dialog. */ static void -file_dialog_cb (widget, client_data, call_data) - Widget widget; - XtPointer call_data, client_data; +file_dialog_cb (Widget widget, XtPointer client_data, XtPointer call_data) { int *result = (int *) client_data; XmAnyCallbackStruct *cb = (XmAnyCallbackStruct *) call_data; @@ -5315,17 +5315,14 @@ in this case. */ static void -file_dialog_unmap_cb (widget, client_data, call_data) - Widget widget; - XtPointer call_data, client_data; +file_dialog_unmap_cb (Widget widget, XtPointer client_data, XtPointer call_data) { int *result = (int *) client_data; *result = XmCR_CANCEL; } static Lisp_Object -clean_up_file_dialog (arg) - Lisp_Object arg; +clean_up_file_dialog (Lisp_Object arg) { struct Lisp_Save_Value *p = XSAVE_VALUE (arg); Widget dialog = (Widget) p->pointer; === modified file 'src/xmenu.c' --- src/xmenu.c 2010-08-13 08:32:13 +0000 +++ src/xmenu.c 2010-10-22 05:49:47 +0000 @@ -89,6 +89,7 @@ #include #endif /* HAVE_XAW3D */ #endif /* USE_LUCID */ +#include "../lwlib/lwlib.h" #else /* not USE_X_TOOLKIT */ #ifndef USE_GTK #include "../oldXMenu/XMenu.h" === modified file 'src/xrdb.c' --- src/xrdb.c 2010-09-25 16:25:04 +0000 +++ src/xrdb.c 2010-10-22 05:49:47 +0000 @@ -48,6 +48,11 @@ #include "lisp.h" +#ifdef USE_MOTIF +/* For Vdouble_click_time. */ +#include "keyboard.h" +#endif + extern char *getenv (const char *); extern struct passwd *getpwuid (uid_t); ------------------------------------------------------------ revno: 102046 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-22 04:30:27 +0000 message: mml.el (mml-preview): Fix last change. diff: === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2010-10-22 04:15:14 +0000 +++ lisp/gnus/mml.el 2010-10-22 04:30:27 +0000 @@ -1494,12 +1494,11 @@ (copy-sequence (if (message-news-p) message-required-news-headers message-required-mail-headers))) - (if (and (not article-editing) - (re-search-forward - (concat "^" (regexp-quote mail-header-separator) "\n") - nil t)) - (replace-match "\n")) - (setq mail-header-separator "") + (unless article-editing + (if (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "\n") nil t) + (replace-match "\n")) + (setq mail-header-separator "")) (message-sort-headers) (mml-to-mime)) (if raw ------------------------------------------------------------ revno: 102045 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-22 04:15:14 +0000 message: mml.el (mml-preview): Work properly when editing article. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-22 01:39:13 +0000 +++ lisp/gnus/ChangeLog 2010-10-22 04:15:14 +0000 @@ -1,5 +1,7 @@ 2010-10-22 Katsumi Yamaoka + * mml.el (mml-preview): Work properly when editing article. + * gnus-start.el (gnus-read-active-file-1): Don't add method to gnus-have-read-active-file if it's already been in. === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2010-10-16 01:55:08 +0000 +++ lisp/gnus/mml.el 2010-10-22 04:15:14 +0000 @@ -1466,6 +1466,7 @@ (require 'gnus-msg) ; for gnus-setup-posting-charset (save-excursion (let* ((buf (current-buffer)) + (article-editing (eq major-mode 'gnus-article-edit-mode)) (message-options message-options) (message-this-is-mail (message-mail-p)) (message-this-is-news (message-news-p)) @@ -1485,15 +1486,20 @@ (mml-preview-insert-mail-followup-to) (let ((message-deletable-headers (if (message-news-p) nil - message-deletable-headers))) + message-deletable-headers)) + (mail-header-separator (if article-editing + "" + mail-header-separator))) (message-generate-headers (copy-sequence (if (message-news-p) message-required-news-headers - message-required-mail-headers)))) - (if (re-search-forward - (concat "^" (regexp-quote mail-header-separator) "\n") nil t) - (replace-match "\n")) - (let ((mail-header-separator ""));; mail-header-separator is removed. + message-required-mail-headers))) + (if (and (not article-editing) + (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "\n") + nil t)) + (replace-match "\n")) + (setq mail-header-separator "") (message-sort-headers) (mml-to-mime)) (if raw ------------------------------------------------------------ revno: 102044 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-10-21 21:03:55 -0700 message: Support for systems without floats was removed a decade ago. * lisp/loadup.el: Unconditionally load float-sup. * lisp/paren.el (show-paren-delay): * lisp/emacs-lisp/float-sup.el: * lisp/emulation/cua-base.el (cua-prefix-override-inhibit-delay): * lisp/obsolete/lazy-lock.el (lazy-lock-defer-time, lazy-lock-stealth-nice) (lazy-lock-stealth-verbose): Assume float support. * lisp/ps-print.el: Assume float support on Emacs. * lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time): Remove non-float branch. * lisp/obsolete/lazy-lock.el: Remove leading `*' from defcustom docs. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-22 03:34:22 +0000 +++ lisp/ChangeLog 2010-10-22 04:03:55 +0000 @@ -1,5 +1,15 @@ 2010-10-22 Glenn Morris + * loadup.el: Unconditionally load float-sup. + * paren.el (show-paren-delay): + * emacs-lisp/float-sup.el: + * emulation/cua-base.el (cua-prefix-override-inhibit-delay): + * obsolete/lazy-lock.el (lazy-lock-defer-time, lazy-lock-stealth-nice) + (lazy-lock-stealth-verbose): Assume float support. + * ps-print.el: Assume float support on Emacs. + * emacs-lisp/timer.el (timer-next-integral-multiple-of-time): + Remove non-float branch. + * emacs-lisp/autoload.el (batch-update-autoloads): Update for src/Makefile no longer being pre-processed. === modified file 'lisp/emacs-lisp/float-sup.el' --- lisp/emacs-lisp/float-sup.el 2010-09-27 20:11:33 +0000 +++ lisp/emacs-lisp/float-sup.el 2010-10-22 04:03:55 +0000 @@ -1,7 +1,7 @@ ;;; float-sup.el --- define some constants useful for floating point numbers. -;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -26,15 +26,8 @@ ;;; Code: -;; Provide a meaningful error message if we are running on -;; bare (non-float) emacs. - -(if (fboundp 'atan) - nil - (error "Floating point was disabled at compile time")) - -;; provide an easy hook to tell if we are running with floats or not. -;; define pi and e via math-lib calls. (much less prone to killer typos.) +;; Provide an easy hook to tell if we are running with floats or not. +;; Define pi and e via math-lib calls (much less prone to killer typos). (defconst float-pi (* 4 (atan 1)) "The value of Pi (3.1415926...).") (defconst pi float-pi "Obsolete since Emacs-23.3. Use `float-pi' instead.") @@ -45,7 +38,7 @@ (defconst radians-to-degrees (/ 180.0 float-pi) "Radian to degree conversion constant.") -;; these expand to a single multiply by a float when byte compiled +;; These expand to a single multiply by a float when byte compiled. (defmacro degrees-to-radians (x) "Convert X from degrees to radians." @@ -56,5 +49,4 @@ (provide 'lisp-float-type) -;; arch-tag: e7837072-a4af-4d08-9953-8a3e755abf9d ;;; float-sup.el ends here === modified file 'lisp/emacs-lisp/timer.el' --- lisp/emacs-lisp/timer.el 2010-08-30 13:03:05 +0000 +++ lisp/emacs-lisp/timer.el 2010-10-22 04:03:55 +0000 @@ -93,31 +93,20 @@ More precisely, the next value, after TIME, that is an integral multiple of SECS seconds since the epoch. SECS may be a fraction." (let ((time-base (ash 1 16))) - (if (fboundp 'atan) - ;; Use floating point, taking care to not lose precision. - (let* ((float-time-base (float time-base)) - (million 1000000.0) - (time-usec (+ (* million - (+ (* float-time-base (nth 0 time)) - (nth 1 time))) - (nth 2 time))) - (secs-usec (* million secs)) - (mod-usec (mod time-usec secs-usec)) - (next-usec (+ (- time-usec mod-usec) secs-usec)) - (time-base-million (* float-time-base million))) - (list (floor next-usec time-base-million) - (floor (mod next-usec time-base-million) million) - (floor (mod next-usec million)))) - ;; Floating point is not supported. - ;; Use integer arithmetic, avoiding overflow if possible. - (let* ((mod-sec (mod (+ (* (mod time-base secs) - (mod (nth 0 time) secs)) - (nth 1 time)) - secs)) - (next-1-sec (+ (- (nth 1 time) mod-sec) secs))) - (list (+ (nth 0 time) (floor next-1-sec time-base)) - (mod next-1-sec time-base) - 0))))) + ;; Use floating point, taking care to not lose precision. + (let* ((float-time-base (float time-base)) + (million 1000000.0) + (time-usec (+ (* million + (+ (* float-time-base (nth 0 time)) + (nth 1 time))) + (nth 2 time))) + (secs-usec (* million secs)) + (mod-usec (mod time-usec secs-usec)) + (next-usec (+ (- time-usec mod-usec) secs-usec)) + (time-base-million (* float-time-base million))) + (list (floor next-usec time-base-million) + (floor (mod next-usec time-base-million) million) + (floor (mod next-usec million)))))) (defun timer-relative-time (time secs &optional usecs) "Advance TIME by SECS seconds and optionally USECS microseconds. @@ -543,5 +532,4 @@ (provide 'timer) -;; arch-tag: b1a9237b-7787-4382-9e46-8f2c3b3273e0 ;;; timer.el ends here === modified file 'lisp/emulation/cua-base.el' --- lisp/emulation/cua-base.el 2010-09-23 06:42:45 +0000 +++ lisp/emulation/cua-base.el 2010-10-22 04:03:55 +0000 @@ -1,7 +1,7 @@ ;;; cua-base.el --- emulate CUA key bindings -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Kim F. Storm ;; Keywords: keyboard emulations convenience cua @@ -300,8 +300,7 @@ :type 'boolean :group 'cua) -(defcustom cua-prefix-override-inhibit-delay - (if (featurep 'lisp-float-type) (/ (float 1) (float 5)) nil) +(defcustom cua-prefix-override-inhibit-delay 0.2 "If non-nil, time in seconds to delay before overriding prefix key. If there is additional input within this time, the prefix key is used as a normal prefix key. So typing a key sequence quickly will @@ -1637,5 +1636,4 @@ (provide 'cua-base) -;; arch-tag: 21fb6289-ba25-4fee-bfdc-f9fb351acf05 ;;; cua-base.el ends here === modified file 'lisp/loadup.el' --- lisp/loadup.el 2010-08-29 16:17:13 +0000 +++ lisp/loadup.el 2010-10-22 04:03:55 +0000 @@ -240,9 +240,8 @@ ;; Do it after loading term/foo-win.el since the value of the ;; mouse-wheel-*-event vars depends on those files being loaded or not. (load "mwheel")) -(if (fboundp 'atan) ; preload some constants and - (progn ; floating pt. functions if we have float support. - (load "emacs-lisp/float-sup"))) +;; Preload some constants and floating point functions. +(load "emacs-lisp/float-sup") (load "vc/vc-hooks") (load "vc/ediff-hook") @@ -403,5 +402,4 @@ ;; no-update-autoloads: t ;; End: -;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335 ;;; loadup.el ends here === modified file 'lisp/obsolete/lazy-lock.el' --- lisp/obsolete/lazy-lock.el 2010-01-13 08:35:10 +0000 +++ lisp/obsolete/lazy-lock.el 2010-10-22 04:03:55 +0000 @@ -310,7 +310,7 @@ ;; User Variables: (defcustom lazy-lock-minimum-size 25600 - "*Minimum size of a buffer for demand-driven fontification. + "Minimum size of a buffer for demand-driven fontification. On-demand fontification occurs if the buffer size is greater than this value. If nil, means demand-driven fontification is never performed. If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE), @@ -334,7 +334,7 @@ :group 'lazy-lock) (defcustom lazy-lock-defer-on-the-fly t - "*If non-nil, means fontification after a change should be deferred. + "If non-nil, means fontification after a change should be deferred. If nil, means on-the-fly fontification is performed. This means when changes occur in the buffer, those areas are immediately fontified. If a list, it should be a list of `major-mode' symbol names for which deferred @@ -354,7 +354,7 @@ :group 'lazy-lock) (defcustom lazy-lock-defer-on-scrolling nil - "*If non-nil, means fontification after a scroll should be deferred. + "If non-nil, means fontification after a scroll should be deferred. If nil, means demand-driven fontification is performed. This means when scrolling into unfontified areas of the buffer, those areas are immediately fontified. Thus scrolling never presents unfontified areas. However, since @@ -379,7 +379,7 @@ :group 'lazy-lock) (defcustom lazy-lock-defer-contextually 'syntax-driven - "*If non-nil, means deferred fontification should be syntactically true. + "If non-nil, means deferred fontification should be syntactically true. If nil, means deferred fontification occurs only on those lines modified. This means where modification on a line causes syntactic change on subsequent lines, those subsequent lines are not refontified to reflect their new context. @@ -396,9 +396,8 @@ (other :tag "syntax-driven" syntax-driven)) :group 'lazy-lock) -(defcustom lazy-lock-defer-time - (if (featurep 'lisp-float-type) (/ (float 1) (float 4)) 1) - "*Time in seconds to delay before beginning deferred fontification. +(defcustom lazy-lock-defer-time 0.25 + "Time in seconds to delay before beginning deferred fontification. Deferred fontification occurs if there is no input within this time. If nil, means fontification is never deferred, regardless of the values of the variables `lazy-lock-defer-on-the-fly', `lazy-lock-defer-on-scrolling' and @@ -410,7 +409,7 @@ :group 'lazy-lock) (defcustom lazy-lock-stealth-time 30 - "*Time in seconds to delay before beginning stealth fontification. + "Time in seconds to delay before beginning stealth fontification. Stealth fontification occurs if there is no input within this time. If nil, means stealth fontification is never performed. @@ -420,7 +419,7 @@ :group 'lazy-lock) (defcustom lazy-lock-stealth-lines (if font-lock-maximum-decoration 100 250) - "*Maximum size of a chunk of stealth fontification. + "Maximum size of a chunk of stealth fontification. Each iteration of stealth fontification can fontify this number of lines. To speed up input response during stealth fontification, at the cost of stealth taking longer to fontify, you could reduce the value of this variable." @@ -429,7 +428,7 @@ (defcustom lazy-lock-stealth-load (if (condition-case nil (load-average) (error)) 200) - "*Load in percentage above which stealth fontification is suspended. + "Load in percentage above which stealth fontification is suspended. Stealth fontification pauses when the system short-term load average (as returned by the function `load-average' if supported) goes above this level, thus reducing the demand that stealth fontification makes on the system. @@ -443,9 +442,8 @@ '(const :format "%t: unsupported\n" nil)) :group 'lazy-lock) -(defcustom lazy-lock-stealth-nice - (if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1) - "*Time in seconds to pause between chunks of stealth fontification. +(defcustom lazy-lock-stealth-nice 0.125 + "Time in seconds to pause between chunks of stealth fontification. Each iteration of stealth fontification is separated by this amount of time, thus reducing the demand that stealth fontification makes on the system. If nil, means stealth fontification is never paused. @@ -457,9 +455,8 @@ :group 'lazy-lock) (defcustom lazy-lock-stealth-verbose - (if (featurep 'lisp-float-type) - (and (not lazy-lock-defer-contextually) (not (null font-lock-verbose)))) - "*If non-nil, means stealth fontification should show status messages." + (and (not lazy-lock-defer-contextually) (not (null font-lock-verbose))) + "If non-nil, means stealth fontification should show status messages." :type 'boolean :group 'lazy-lock) @@ -1058,5 +1055,4 @@ ;; byte-compile-warnings: (not obsolete) ;; End: -;; arch-tag: c1776846-f046-4a45-9684-54b951b12fc9 ;;; lazy-lock.el ends here === modified file 'lisp/paren.el' --- lisp/paren.el 2010-01-13 08:35:10 +0000 +++ lisp/paren.el 2010-10-22 04:03:55 +0000 @@ -52,8 +52,7 @@ :type '(choice (const parenthesis) (const expression) (const mixed)) :group 'paren-showing) -(defcustom show-paren-delay - (if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1) +(defcustom show-paren-delay 0.125 "Time in seconds to delay before showing a matching paren." :type '(number :tag "seconds") :group 'paren-showing) @@ -253,5 +252,4 @@ (provide 'paren) -;; arch-tag: d0969b88-7ac0-4bd0-bd53-e73b892b86a9 ;;; paren.el ends here === modified file 'lisp/ps-print.el' --- lisp/ps-print.el 2010-10-19 11:44:07 +0000 +++ lisp/ps-print.el 2010-10-22 04:03:55 +0000 @@ -1466,12 +1466,9 @@ (require 'lpr) -(or (featurep 'lisp-float-type) - (error "`ps-print' requires floating point support")) - - (if (featurep 'xemacs) - () + (or (featurep 'lisp-float-type) + (error "`ps-print' requires floating point support")) (unless (and (boundp 'emacs-major-version) (>= emacs-major-version 23)) (error "`ps-print' only supports Emacs 23 and higher"))) @@ -6726,5 +6723,4 @@ (provide 'ps-print) -;; arch-tag: fb06a585-1112-4206-885d-a57d95d50579 ;;; ps-print.el ends here ------------------------------------------------------------ revno: 102043 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-10-21 20:38:52 -0700 message: Fix format of old ChangeLog entry. diff: === modified file 'src/ChangeLog.9' --- src/ChangeLog.9 2010-10-14 14:32:27 +0000 +++ src/ChangeLog.9 2010-10-22 03:38:52 +0000 @@ -12476,9 +12476,9 @@ * atimer.c (stop_other_atimers): Don't call cancel_atimer because that unblocks alarms. - * alloc.c, bytecode.c, data.c, dispnew.c, ecrt0.c, editfns.c, - emacs.c, floatfns.c, fns.c, lread.c, print.c, config.in, lisp.h, - Makefile.in: Remove `LISP_FLOAT_TYPE' and `standalone'. + * alloc.c, bytecode.c, data.c, dispnew.c, ecrt0.c, editfns.c: + * emacs.c, floatfns.c, fns.c, lread.c, print.c, config.in, lisp.h: + * Makefile.in: Remove `LISP_FLOAT_TYPE' and `standalone'. * frame.c (make_frame): Set frame initially to `garbaged'. @@ -13312,4 +13312,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . -;;; arch-tag: 38875948-6e89-4f08-b0ca-ff328f1e8b72 ------------------------------------------------------------ revno: 102042 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-10-21 20:37:20 -0700 message: * src/Makefile.in (SOME_MACHINE_LISP): Add w32-vars. Remove ccl and duplicate mouse. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-21 17:27:32 +0000 +++ src/ChangeLog 2010-10-22 03:37:20 +0000 @@ -1,3 +1,8 @@ +2010-10-22 Glenn Morris + + * Makefile.in (SOME_MACHINE_LISP): Add w32-vars. + Remove ccl and duplicate mouse. + 2010-10-21 Chong Yidong * insdel.c (prepare_to_modify_buffer): Don't set === modified file 'src/Makefile.in' --- src/Makefile.in 2010-10-20 03:52:27 +0000 +++ src/Makefile.in 2010-10-22 03:37:20 +0000 @@ -1,5 +1,5 @@ +# src/Makefile for GNU Emacs. -# Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. @@ -575,18 +575,18 @@ ## Like $shortlisp, but includes only those files from $lisp that are loaded ## conditionally (i.e., only on some platforms). +## Confusingly, term/internal is not in loadup, but is unconditionally +## loaded by pc-win, which is. SOME_MACHINE_LISP = ../lisp/mouse.elc \ ../lisp/select.elc ../lisp/scroll-bar.elc \ ../lisp/ls-lisp.elc ../lisp/dos-fns.elc \ ../lisp/w32-fns.elc ../lisp/dos-w32.elc \ - ../lisp/disp-table.elc ../lisp/dos-vars.elc \ + ../lisp/disp-table.elc ../lisp/dos-vars.elc ../lisp/w32-vars.elc \ ../lisp/tooltip.elc ../lisp/image.elc \ ../lisp/fringe.elc ../lisp/dnd.elc \ ../lisp/mwheel.elc ../lisp/tool-bar.elc \ ../lisp/x-dnd.elc ../lisp/dynamic-setting.elc \ - ../lisp/international/ccl.elc \ ../lisp/international/fontset.elc \ - ../lisp/mouse.elc \ ../lisp/term/common-win.elc \ ../lisp/term/x-win.elc \ ../lisp/term/pc-win.elc ../lisp/term/internal.elc \ ------------------------------------------------------------ revno: 102041 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-10-21 20:34:22 -0700 message: Add bug ref to Changelog entry. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-22 03:32:46 +0000 +++ lisp/ChangeLog 2010-10-22 03:34:22 +0000 @@ -34,7 +34,7 @@ * progmodes/cc-mode.el (c-before-change, c-after-change): Move the setting of c-new-BEG and c-new-END from c-before-change to - c-after-change. + c-after-change. (Bug#7181) 2010-10-19 Chong Yidong ------------------------------------------------------------ revno: 102040 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-10-21 20:32:46 -0700 message: Small autoloads fix. * lisp/emacs-lisp/autoload.el (batch-update-autoloads): Update for src/Makefile no longer being pre-processed. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-22 03:17:26 +0000 +++ lisp/ChangeLog 2010-10-22 03:32:46 +0000 @@ -1,3 +1,8 @@ +2010-10-22 Glenn Morris + + * emacs-lisp/autoload.el (batch-update-autoloads): Update for + src/Makefile no longer being pre-processed. + 2010-10-22 Stefan Monnier * emacs-lisp/find-func.el (find-library): Use test-completion. === modified file 'lisp/emacs-lisp/autoload.el' --- lisp/emacs-lisp/autoload.el 2010-08-29 16:17:13 +0000 +++ lisp/emacs-lisp/autoload.el 2010-10-22 03:32:46 +0000 @@ -778,16 +778,17 @@ (with-temp-buffer (insert-file-contents mfile) (when (re-search-forward "^shortlisp= " nil t) - (setq lim (line-end-position)) - (while (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>" - lim t) + (while (and (not lim) + (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>" + nil t)) (push (expand-file-name (match-string 1) ldir) - autoload-excludes)))))))) + autoload-excludes) + (skip-chars-forward " \t") + (if (eolp) (setq lim t))))))))) (let ((args command-line-args-left)) (setq command-line-args-left nil) (apply 'update-directory-autoloads args))) (provide 'autoload) -;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6 ;;; autoload.el ends here ------------------------------------------------------------ revno: 102039 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-10-21 20:28:21 -0700 message: * admin/make-tarball.txt: Misc updates. diff: === modified file 'admin/make-tarball.txt' --- admin/make-tarball.txt 2010-05-15 21:12:44 +0000 +++ admin/make-tarball.txt 2010-10-22 03:28:21 +0000 @@ -4,7 +4,8 @@ For each step, check for possible errors. -1. cvs -q update -Pd +1. `bzr update' (for a bound branch), or `bzr pull'. + bzr status # check for locally modified files 2. Bootstrap to make 100% sure all elc files are up-to-date, and to make sure that the later tagged version will bootstrap, should it be @@ -27,24 +28,23 @@ refer to a newer release of Emacs. (This is probably needed only when preparing a major Emacs release, or branching for it.) -5. rm configure; autoconf +5. rm configure src/config.in; autoconf; autoheader make bootstrap -6. Commit configure, README, doc/emacs/emacs.texi, - doc/lispref/elisp.texi, etc/AUTHORS, src/emacs.c, nt/emacs.rc, - and lisp/cus-edit.el (if modified). Copy lisp/loaddefs.el to - lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. For a release, - also commit the ChangeLog files in all directories. +6. Commit configure, src/config.in, etc/AUTHORS, all the files changed + by M-x set-version, and lisp/cus-edit.el (if modified). + Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. + For a release, also commit the ChangeLog files in all directories. 7. make-dist --snapshot. Check the contents of the new tar with admin/diff-tar-files against an older tar file. Some old pretest - tarballs are kept under fencepost.gnu.org:~pot/emacs-pretest/, while - old emacs tarballs are at . + tarballs may be found at ; + old release tarballs are at . If this is the first pretest of a major release, just comparing with the previous release may overlook many new files. You can try - something like `find -f | grep -v CVS...etc' in a clean CVS tree, - and compare the results against the new tar contents. + something like `find . | sort' in a clean bzr tree, and compare the + results against the new tar contents. 8. xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta @@ -108,5 +108,3 @@ For a release, announce it on info-gnu@gnu.org, info-gnu-emacs@gnu.org, and emacs-devel. - -# arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390 ------------------------------------------------------------ revno: 102038 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-10-21 20:26:34 -0700 message: * make-dist: Avoid listing .el files twice. Don't try to run autoconf if --no-update. diff: === modified file 'ChangeLog' --- ChangeLog 2010-10-20 03:55:30 +0000 +++ ChangeLog 2010-10-22 03:26:34 +0000 @@ -1,3 +1,8 @@ +2010-10-22 Glenn Morris + + * make-dist: Avoid listing .el files twice. Don't try to run + autoconf if --no-update. + 2010-10-20 Glenn Morris * make-dist: No longer create lisp/MANIFEST. === modified file 'make-dist' --- make-dist 2010-10-20 03:55:30 +0000 +++ make-dist 2010-10-22 03:26:34 +0000 @@ -186,72 +186,66 @@ exit 1 fi -### Find where to run Emacs. -if [ $check = yes ]; -then - ### Check for .elc files with no corresponding .el file. +if [ $check = yes ]; then ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - leim/[a-z]*/[a-z]*.el | sed 's/\.el$/.elc/' > /tmp/el + leim/[a-z]*/[a-z]*.el > /tmp/el + ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \ lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \ leim/[a-z]*/[a-z]*.elc > /tmp/elc - bogosities="`comm -13 /tmp/el /tmp/elc`" - if [ "${bogosities}" != "" ]; then + + ## Check for .elc files with no corresponding .el file. + sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc + + bogosities="`comm -13 /tmp/elelc /tmp/elc`" + if [ x"${bogosities}" != x"" ]; then echo "The following .elc files have no corresponding .el files:" echo "${bogosities}" fi - rm -f /tmp/el /tmp/elc ### Check for .el files with no corresponding .elc file. - ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \ - lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - leim/[a-z]*/[a-z]*.el > /tmp/el - ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \ - lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - leim/[a-z]*/[a-z]*.elc | sed 's/\.elc$/.el/' > /tmp/elc - losers="`comm -23 /tmp/el /tmp/elc`" + sed 's/\.elc$/.el/' /tmp/elc > /tmp/elcel + losers="`comm -23 /tmp/el /tmp/elcel`" + + rm -f /tmp/el /tmp/elc /tmp/elcel /tmp/elelc + bogosities= for file in $losers; do - if ! grep -q "no-byte-compile: t" $file; then - case $file in - site-init.el | site-load.el | site-start.el | default.el) - ;; - *) - bogosities="$file $bogosities" - ;; - esac - fi + grep -q "no-byte-compile: t" $file && continue + case $file in + site-init.el | site-load.el | site-start.el | default.el) continue ;; + esac + + bogosities="$file $bogosities" + done if [ x"${bogosities}" != x"" ]; then echo "The following .el files have no corresponding .elc files:" echo "${bogosities}" fi - rm -f /tmp/el /tmp/elc -fi - -### Make sure configure is newer than configure.in. -if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then - echo "\`./configure.in' is newer than \`./configure'" >&2 - echo "Running autoconf" >&2 - autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; } -fi - -### Make sure src/stamp-h.in is newer than configure.in. -if [ "x`ls -t src/stamp-h.in configure.in | sed q`" != "xsrc/stamp-h.in" ]; then - echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2 - echo "Running autoheader" >&2 - autoheader || { x=$?; echo Autoheader FAILED! >&2; exit $x; } - rm -f src/stamp-h.in - echo timestamp > src/stamp-h.in -fi - -if [ $update = yes ]; -then +fi + +if [ $update = yes ]; then + + ## Make sure configure is newer than configure.in. + if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then + echo "\`./configure.in' is newer than \`./configure'" >&2 + echo "Running autoconf" >&2 + autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; } + fi + + ## Make sure src/stamp-h.in is newer than configure.in. + if [ "x`ls -t src/stamp-h.in configure.in | sed q`" != "xsrc/stamp-h.in" ]; then + echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2 + echo "Running autoheader" >&2 + autoheader || { x=$?; echo Autoheader FAILED! >&2; exit $x; } + rm -f src/stamp-h.in + echo timestamp > src/stamp-h.in + fi + echo "Updating Info files" (cd doc/emacs; make info) (cd doc/misc; make info) @@ -268,7 +262,7 @@ echo "Recompiling Lisp files" $EMACS -batch -f batch-byte-recompile-directory lisp leim -fi +fi # $update = yes echo "Creating staging directory: \`${tempparent}'" ------------------------------------------------------------ revno: 102037 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2010-10-21 23:17:26 -0400 message: * lisp/emacs-lisp/find-func.el (find-library): Use test-completion. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-21 20:12:38 +0000 +++ lisp/ChangeLog 2010-10-22 03:17:26 +0000 @@ -1,7 +1,10 @@ +2010-10-22 Stefan Monnier + + * emacs-lisp/find-func.el (find-library): Use test-completion. + 2010-10-21 Lars Magne Ingebrigtsen - * newcomment.el (comment-dwim): Fix the intentation in the doc - string. + * newcomment.el (comment-dwim): Fix the intentation in the doc string. 010-10-21 Michael Albinus @@ -13,15 +16,15 @@ 2010-10-21 Daiki Ueno - * hexl.el (hexl-mode, hexl-mode-exit): Tweak - revert-buffer-function to inhibit auto-mode-alist (Bug#7252). + * hexl.el (hexl-mode, hexl-mode-exit): + Tweak revert-buffer-function to inhibit auto-mode-alist (Bug#7252). (hexl-revert-buffer-function): New function. (hexl-before-revert-hook, hexl-after-revert-hook): Abolish. 2010-10-19 Alan Mackenzie - * progmodes/cc-langs.el (c-type-decl-prefix-key): C++ bit: move - "\(const\|throw\|volatile\)\>" nearer the start of the regexp, so + * progmodes/cc-langs.el (c-type-decl-prefix-key): C++ bit: + Move "\(const\|throw\|volatile\)\>" nearer the start of the regexp, so that these keywords aren't wrongly matched as identifiers. * progmodes/cc-mode.el (c-before-change, c-after-change): Move the === modified file 'lisp/emacs-lisp/find-func.el' --- lisp/emacs-lisp/find-func.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/find-func.el 2010-10-22 03:17:26 +0000 @@ -213,6 +213,8 @@ (interactive (let* ((dirs (or find-function-source-path load-path)) (suffixes (find-library-suffixes)) + (table (apply-partially 'locate-file-completion-table + dirs suffixes)) (def (if (eq (function-called-at-point) 'require) ;; `function-called-at-point' may return 'require ;; with `point' anywhere on this line. So wrap the @@ -226,16 +228,12 @@ (thing-at-point 'symbol)) (error nil)) (thing-at-point 'symbol)))) - (when def - (setq def (and (locate-file-completion-table - dirs suffixes def nil 'lambda) - def))) + (when (and def (not (test-completion def table))) + (setq def nil)) (list (completing-read (if def (format "Library name (default %s): " def) "Library name: ") - (apply-partially 'locate-file-completion-table - dirs suffixes) - nil nil nil nil def)))) + table nil nil nil nil def)))) (let ((buf (find-file-noselect (find-library-name library)))) (condition-case nil (switch-to-buffer buf) (error (pop-to-buffer buf))))) ------------------------------------------------------------ revno: 102036 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-22 01:39:13 +0000 message: gnus-group.el (gnus-group-unsubscribe-group): Fix args passed to gnus-group-completing-read. gnus-start.el (gnus-read-active-file-1): Don't add method to gnus-have-read-active-file if it's already been in. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-21 22:12:01 +0000 +++ lisp/gnus/ChangeLog 2010-10-22 01:39:13 +0000 @@ -1,3 +1,13 @@ +2010-10-22 Katsumi Yamaoka + + * gnus-start.el (gnus-read-active-file-1): Don't add method to + gnus-have-read-active-file if it's already been in. + +2010-10-22 Tom Tromey + + * gnus-group.el (gnus-group-unsubscribe-group): Fix args passed to + gnus-group-completing-read. + 2010-10-21 Lars Magne Ingebrigtsen * message.el (message-mode-map): Don't bind M-; to comment region, to === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2010-10-18 22:09:28 +0000 +++ lisp/gnus/gnus-group.el 2010-10-22 01:39:13 +0000 @@ -3676,7 +3676,7 @@ Killed newsgroups are subscribed. If SILENT, don't try to update the group line." (interactive (list (gnus-group-completing-read - nil (gnus-read-active-file-p)))) + nil nil (gnus-read-active-file-p)))) (let ((newsrc (gnus-group-entry group))) (cond ((string-match "^[ \t]*$" group) === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2010-10-07 22:26:11 +0000 +++ lisp/gnus/gnus-start.el 2010-10-22 01:39:13 +0000 @@ -2090,7 +2090,7 @@ (gnus-message 5 "%s" mesg) (gnus-active-to-gnus-format method gnus-active-hashtb nil t) ;; We mark this active file as read. - (push method gnus-have-read-active-file) + (add-to-list 'gnus-have-read-active-file method) (gnus-message 5 "%sdone" mesg))))))) (defun gnus-read-active-file-2 (groups method) ------------------------------------------------------------ revno: 102035 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-10-21 22:12:01 +0000 message: message.el (message-setup-1): Allow message-default-headers to be a function. message.el (message-mode-map): Don't bind M-; to comment region, to allow the global comment-dwim to work. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-21 02:31:33 +0000 +++ doc/misc/ChangeLog 2010-10-21 22:12:01 +0000 @@ -1,3 +1,8 @@ +2010-10-21 Julien Danjou + + * message.texi (Message Headers): Allow message-default-headers to be a + function. + 2010-10-21 Lars Magne Ingebrigtsen * gnus-news.texi: Mention new archive defaults. === modified file 'doc/misc/message.texi' --- doc/misc/message.texi 2010-10-06 12:38:45 +0000 +++ doc/misc/message.texi 2010-10-21 22:12:01 +0000 @@ -1451,7 +1451,7 @@ @item message-default-headers @vindex message-default-headers This string is inserted at the end of the headers in all message -buffers. +buffers. If set to a function, the returned results is inserted. @item message-subject-re-regexp @vindex message-subject-re-regexp === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-21 05:36:36 +0000 +++ lisp/gnus/ChangeLog 2010-10-21 22:12:01 +0000 @@ -1,3 +1,13 @@ +2010-10-21 Lars Magne Ingebrigtsen + + * message.el (message-mode-map): Don't bind M-; to comment region, to + allow the global comment-dwim to work. + +2010-10-21 Julien Danjou + + * message.el (message-setup-1): Allow message-default-headers to be a + function. + 2010-10-21 Katsumi Yamaoka * shr.el (shr-tag-table): Simplify. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-10-21 01:49:12 +0000 +++ lisp/gnus/message.el 2010-10-21 22:12:01 +0000 @@ -1139,9 +1139,10 @@ :error "All header lines must be newline terminated") (defcustom message-default-headers "" - "*A string containing header lines to be inserted in outgoing messages. -It is inserted before you edit the message, so you can edit or delete -these lines." + "A string containing header lines to be inserted in outgoing messages. +It is inserted before you edit the message, so you can edit or +delete these lines. If set to a function, it is called and its +result is inserted." :version "23.2" :group 'message-headers :link '(custom-manual "(message)Message Headers") @@ -2639,7 +2640,6 @@ (define-key message-mode-map "\C-a" 'message-beginning-of-line) (define-key message-mode-map "\t" 'message-tab) - (define-key message-mode-map "\M-;" 'comment-region) (define-key message-mode-map "\M-n" 'message-display-abbrev)) @@ -6363,7 +6363,10 @@ headers) (delete-region (point) (progn (forward-line -1) (point))) (when message-default-headers - (insert message-default-headers) + (insert + (if (functionp message-default-headers) + (funcall message-default-headers) + message-default-headers)) (or (bolp) (insert ?\n))) (insert mail-header-separator "\n") (forward-line -1) ------------------------------------------------------------ revno: 102034 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2010-10-21 22:12:38 +0200 message: * newcomment.el (comment-dwim): Fix the intentation in the doc string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-21 08:05:23 +0000 +++ lisp/ChangeLog 2010-10-21 20:12:38 +0000 @@ -1,3 +1,8 @@ +2010-10-21 Lars Magne Ingebrigtsen + + * newcomment.el (comment-dwim): Fix the intentation in the doc + string. + 010-10-21 Michael Albinus * net/tramp-sh.el (tramp-do-file-attributes-with-stat): Do not use === modified file 'lisp/newcomment.el' --- lisp/newcomment.el 2010-09-23 19:00:31 +0000 +++ lisp/newcomment.el 2010-10-21 20:12:38 +0000 @@ -1164,8 +1164,8 @@ (defun comment-dwim (arg) "Call the comment command you want (Do What I Mean). If the region is active and `transient-mark-mode' is on, call - `comment-region' (unless it only consists of comments, in which - case it calls `uncomment-region'). +`comment-region' (unless it only consists of comments, in which +case it calls `uncomment-region'). Else, if the current line is empty, call `comment-insert-comment-function' if it is defined, otherwise insert a comment and indent it. Else if a prefix ARG is specified, call `comment-kill'. ------------------------------------------------------------ revno: 102033 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-10-21 13:27:32 -0400 message: * insdel.c (prepare_to_modify_buffer): Don't set saved-region-selection if modification hooks are disabled. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-19 15:43:27 +0000 +++ src/ChangeLog 2010-10-21 17:27:32 +0000 @@ -1,3 +1,8 @@ +2010-10-21 Chong Yidong + + * insdel.c (prepare_to_modify_buffer): Don't set + saved-region-selection if modification hooks are disabled. + 2010-10-19 Chong Yidong * cmds.c (Fdelete_char): Doc fix. === modified file 'src/insdel.c' --- src/insdel.c 2010-09-25 19:50:13 +0000 +++ src/insdel.c 2010-10-21 17:27:32 +0000 @@ -2051,6 +2051,7 @@ /* If `select-active-regions' is non-nil, save the region text. */ if (!NILP (current_buffer->mark_active) + && !inhibit_modification_hooks && XMARKER (current_buffer->mark)->buffer && NILP (Vsaved_region_selection) && (EQ (Vselect_active_regions, Qonly) ------------------------------------------------------------ revno: 102032 committer: Michael Albinus branch nick: trunk timestamp: Thu 2010-10-21 10:05:23 +0200 message: * net/tramp-sh.el (tramp-do-file-attributes-with-stat): Do not use space in stat format string. (tramp-send-command): Unset $PS1 when using here documents, in order not to get several prompts. (tramp-get-inline-coding): Return `nil' in case of errors. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-21 02:38:46 +0000 +++ lisp/ChangeLog 2010-10-21 08:05:23 +0000 @@ -1,3 +1,11 @@ +010-10-21 Michael Albinus + + * net/tramp-sh.el (tramp-do-file-attributes-with-stat): Do not use + space in stat format string. + (tramp-send-command): Unset $PS1 when using here documents, in + order not to get several prompts. + (tramp-get-inline-coding): Return `nil' in case of errors. + 2010-10-21 Daiki Ueno * hexl.el (hexl-mode, hexl-mode-exit): Tweak === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2010-10-19 09:50:07 +0000 +++ lisp/net/tramp-sh.el 2010-10-21 08:05:23 +0000 @@ -67,7 +67,7 @@ :group 'tramp :type 'string) -;; ksh on OpenBSD 4.5 requires, that PS1 contains a `#' character for +;; ksh on OpenBSD 4.5 requires, that $PS1 contains a `#' character for ;; root users. It uses the `$' character for other users. In order ;; to guarantee a proper prompt, we use "#$" for the prompt. @@ -1241,7 +1241,7 @@ (format ;; On Opsware, pdksh (which is the true name of ksh there) doesn't ;; parse correctly the sequence "((". Therefore, we add a space. - "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' %s || echo nil)" + "( (%s %s || %s -h %s) && %s -c '((\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' %s || echo nil)" (tramp-get-file-exists-command vec) (tramp-shell-quote-argument localname) (tramp-get-test-command vec) @@ -4359,6 +4359,11 @@ ;; We mark the command string that it can be erased in the output buffer. (tramp-set-connection-property p "check-remote-echo" t) (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark))) + (when (string-match "<<'EOF'" command) + ;; Unset $PS1 when using here documents, in order not to get + ;; several prompts. + (setq command (concat "(PS1= ; " command "\n)"))) + ;; Send the command. (tramp-message vec 6 "%s" command) (tramp-send-string vec command) (unless nooutput (tramp-wait-for-output p)))) @@ -4897,54 +4902,57 @@ Otherwise, either a string is returned which contains a `%s' mark to be used for the respective input or output file; or a Lisp function cell is returned to be applied on a buffer." - (let ((coding - (with-connection-property vec prop - (tramp-find-inline-encoding vec) - (tramp-get-connection-property vec prop nil))) - (prop1 (if (string-match "encoding" prop) - "inline-compress" "inline-decompress")) - compress) - ;; The connection property might have been cached. So we must send - ;; the script to the remote side - maybe. - (when (and coding (symbolp coding) (string-match "remote" prop)) - (let ((name (symbol-name coding))) - (while (string-match (regexp-quote "-") name) - (setq name (replace-match "_" nil t name))) - (tramp-maybe-send-script vec (symbol-value coding) name) - (setq coding name))) - (when coding - ;; Check for the `compress' command. - (setq compress (tramp-get-inline-compress vec prop1 size)) - ;; Return the value. - (cond - ((and compress (symbolp coding)) - (if (string-match "decompress" prop1) + ;; We must catch the errors, because we want to return `nil', when + ;; no inline coding is found. + (ignore-errors + (let ((coding + (with-connection-property vec prop + (tramp-find-inline-encoding vec) + (tramp-get-connection-property vec prop nil))) + (prop1 (if (string-match "encoding" prop) + "inline-compress" "inline-decompress")) + compress) + ;; The connection property might have been cached. So we must + ;; send the script to the remote side - maybe. + (when (and coding (symbolp coding) (string-match "remote" prop)) + (let ((name (symbol-name coding))) + (while (string-match (regexp-quote "-") name) + (setq name (replace-match "_" nil t name))) + (tramp-maybe-send-script vec (symbol-value coding) name) + (setq coding name))) + (when coding + ;; Check for the `compress' command. + (setq compress (tramp-get-inline-compress vec prop1 size)) + ;; Return the value. + (cond + ((and compress (symbolp coding)) + (if (string-match "decompress" prop1) + `(lambda (beg end) + (,coding beg end) + (let ((coding-system-for-write 'binary) + (coding-system-for-read 'binary)) + (apply + 'call-process-region (point-min) (point-max) + (car (split-string ,compress)) t t nil + (cdr (split-string ,compress))))) `(lambda (beg end) - (,coding beg end) (let ((coding-system-for-write 'binary) (coding-system-for-read 'binary)) (apply - 'call-process-region (point-min) (point-max) + 'call-process-region beg end (car (split-string ,compress)) t t nil - (cdr (split-string ,compress))))) - `(lambda (beg end) - (let ((coding-system-for-write 'binary) - (coding-system-for-read 'binary)) - (apply - 'call-process-region beg end - (car (split-string ,compress)) t t nil - (cdr (split-string ,compress)))) - (,coding (point-min) (point-max))))) - ((symbolp coding) - coding) - ((and compress (string-match "decoding" prop)) - (format "(%s | %s >%%s)" coding compress)) - (compress - (format "(%s <%%s | %s)" compress coding)) - ((string-match "decoding" prop) - (format "%s >%%s" coding)) - (t - (format "%s <%%s" coding)))))) + (cdr (split-string ,compress)))) + (,coding (point-min) (point-max))))) + ((symbolp coding) + coding) + ((and compress (string-match "decoding" prop)) + (format "(%s | %s >%%s)" coding compress)) + (compress + (format "(%s <%%s | %s)" compress coding)) + ((string-match "decoding" prop) + (format "%s >%%s" coding)) + (t + (format "%s <%%s" coding))))))) ;;; Integration of eshell.el: ------------------------------------------------------------ revno: 102031 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-10-21 05:36:36 +0000 message: shr.el (shr-tag-table): Simplify. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-21 03:48:01 +0000 +++ lisp/gnus/ChangeLog 2010-10-21 05:36:36 +0000 @@ -1,3 +1,7 @@ +2010-10-21 Katsumi Yamaoka + + * shr.el (shr-tag-table): Simplify. + 2010-10-21 Lars Magne Ingebrigtsen * gnus-html.el (gnus-html-prefetch-images): Only prefetch http images === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-10-21 01:49:12 +0000 +++ lisp/gnus/shr.el 2010-10-21 05:36:36 +0000 @@ -642,92 +642,43 @@ (nbody (if body (shr-max-columns body))) (nfooter (if footer (shr-max-columns footer)))) (shr-tag-table-1 - (if caption - (if header - (if footer - ;; caption + hader + body + footer - (if (= nheader nbody) - (if (= nbody nfooter) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header ,@body ,@footer))))) - (if (= nfooter 1) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header ,@body)))) - ,@footer) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header ,@body)))) - (tr (td (table (tbody ,@footer))))))) - (if (= nbody nfooter) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body ,@footer))))) - (if (= nfooter 1) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body)))) - ,@footer) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body)))) - (tr (td (table (tbody ,@footer)))))))) - ;; caption + header + body - (if (= nheader nbody) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header ,@body))))) - (if (= nheader 1) - `((tr (td ,@caption)) - ,@header (tr (td (table (tbody ,@body))))) - `((tr (td ,@caption)) - (tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body)))))))) - (if footer - ;; caption + body + footer - (if (= nbody nfooter) - `((tr (td (table (tbody ,@body ,@footer))))) - (if (= nfooter 1) - `((tr (td (table (tbody ,@body)))) ,@footer) - `((tr (td (table (tbody ,@body)))) - (tr (td (table (tbody ,@footer))))))) - ;; caption + body - `((tr (td ,@caption)) - (tr (td (table (tbody ,@body))))))) - (if header - (if footer - ;; header + body + footer - (if (= nheader nbody) - (if (= nbody nfooter) - `((tr (td (table (tbody ,@header ,@body ,@footer))))) - (if (= nfooter 1) - `((tr (td (table (tbody ,@header ,@body)))) - ,@footer) - `((tr (td (table (tbody ,@header ,@body)))) - (tr (td (table (tbody ,@footer))))))) - (if (= nbody nfooter) - `((tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body ,@footer))))) - (if (= nfooter 1) - `((tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body)))) - ,@footer) - `((tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body)))) - (tr (td (table (tbody ,@footer)))))))) - ;; header + body - (if (= nheader nbody) - `((tr (td (table (tbody ,@header ,@body))))) - (if (= nheader 1) - `(,@header (tr (td (table (tbody ,@body))))) - `((tr (td (table (tbody ,@header)))) - (tr (td (table (tbody ,@body)))))))) - (if footer - ;; body + footer - (if (= nbody nfooter) - `((tr (td (table (tbody ,@body ,@footer))))) - (if (= nfooter 1) - `((tr (td (table (tbody ,@body)))) ,@footer) - `((tr (td (table (tbody ,@body)))) - (tr (td (table (tbody ,@footer))))))) - body)))))) + (nconc + (if caption `((tr (td ,@caption)))) + (if header + (if footer + ;; hader + body + footer + (if (= nheader nbody) + (if (= nbody nfooter) + `((tr (td (table (tbody ,@header ,@body ,@footer))))) + (nconc `((tr (td (table (tbody ,@header ,@body))))) + (if (= nfooter 1) + footer + `((tr (td (table (tbody ,@footer)))))))) + (nconc `((tr (td (table (tbody ,@header))))) + (if (= nbody nfooter) + `((tr (td (table (tbody ,@body ,@footer))))) + (nconc `((tr (td (table (tbody ,@body))))) + (if (= nfooter 1) + footer + `((tr (td (table (tbody ,@footer)))))))))) + ;; header + body + (if (= nheader nbody) + `((tr (td (table (tbody ,@header ,@body))))) + (if (= nheader 1) + `(,@header (tr (td (table (tbody ,@body))))) + `((tr (td (table (tbody ,@header)))) + (tr (td (table (tbody ,@body)))))))) + (if footer + ;; body + footer + (if (= nbody nfooter) + `((tr (td (table (tbody ,@body ,@footer))))) + (nconc `((tr (td (table (tbody ,@body))))) + (if (= nfooter 1) + footer + `((tr (td (table (tbody ,@footer)))))))) + (if caption + `((tr (td (table (tbody ,@body))))) + body))))))) (defun shr-find-elements (cont type) (let (result)