Now on revision 111390. ------------------------------------------------------------ revno: 111390 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-12-31 18:09:00 +0200 message: Fix a bug with time zones on MS-Windows. src/w32.c (unsetenv): Set up the string passed to _putenv correctly. See http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html for the bug this caused. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-12-30 21:34:39 +0000 +++ src/ChangeLog 2012-12-31 16:09:00 +0000 @@ -1,3 +1,10 @@ +2012-12-31 Eli Zaretskii + + * w32.c (unsetenv): Set up the string passed to _putenv + correctly. See + http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html + for the bug this caused. + 2012-12-30 Paul Eggert * coding.c (Qmac): Now static. === modified file 'src/w32.c' --- src/w32.c 2012-12-25 17:14:23 +0000 +++ src/w32.c 2012-12-31 16:09:00 +0000 @@ -1784,6 +1784,7 @@ /* It is safe to use 'alloca' with 32K size, since the stack is at least 2MB, and we set it to 8MB in the link command line. */ var = alloca (name_len + 2); + strncpy (var, name, name_len); var[name_len++] = '='; var[name_len] = '\0'; return _putenv (var); ------------------------------------------------------------ revno: 111389 author: Jürgen Hötzel committer: Michael Albinus branch nick: trunk timestamp: Mon 2012-12-31 16:29:23 +0100 message: * net/tramp-adb.el (tramp-adb-maybe-open-connection): Handle errors (No device connected, invalid device name). (Bug #13299) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-12-31 11:35:13 +0000 +++ lisp/ChangeLog 2012-12-31 15:29:23 +0000 @@ -1,3 +1,8 @@ +2012-12-31 Jürgen Hötzel + + * net/tramp-adb.el (tramp-adb-maybe-open-connection): Handle errors + (No device connected, invalid device name). (Bug #13299) + 2012-12-31 Martin Rudalics * window.el (window-resizable--p): Rename to window-resizable-p. === modified file 'lisp/net/tramp-adb.el' --- lisp/net/tramp-adb.el 2012-12-27 19:00:57 +0000 +++ lisp/net/tramp-adb.el 2012-12-31 15:29:23 +0000 @@ -998,11 +998,24 @@ Does not do anything if a connection is already open, but re-opens the connection if a previous connection has died for some reason." (let* ((buf (tramp-get-connection-buffer vec)) - (p (get-buffer-process buf))) + (p (get-buffer-process buf)) + (devices (mapcar 'cadr (tramp-adb-parse-device-names nil)))) (unless (and p (processp p) (memq (process-status p) '(run open))) (save-match-data (when (and p (processp p)) (delete-process p)) + (if (not devices) + (tramp-error vec 'file-error "No device connected")) + (if (and (tramp-file-name-host vec) + (not (member (tramp-file-name-host vec) devices))) + (tramp-error + vec 'file-error + "Device %s not connected" (tramp-file-name-host vec))) + (if (and (not (eq (length devices) 1)) + (not (tramp-file-name-host vec))) + (tramp-error + vec 'file-error + "Multiple Devices connected: No Host/Device specified")) (with-tramp-progress-reporter vec 3 "Opening adb shell connection" (let* ((coding-system-for-read 'utf-8-dos) ;is this correct? (process-connection-type tramp-process-connection-type) ------------------------------------------------------------ revno: 111388 committer: martin rudalics branch nick: trunk timestamp: Mon 2012-12-31 12:35:13 +0100 message: Once more fix resizing of rmail summary window. * window.el (window-resizable--p): Rename to window-resizable-p. (window-resize-no-error): New function. * mail/rmail.el (rmail-maybe-display-summary): Restore behavior broken in fix from 2012-12-28. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-12-31 04:43:35 +0000 +++ lisp/ChangeLog 2012-12-31 11:35:13 +0000 @@ -1,3 +1,11 @@ +2012-12-31 Martin Rudalics + + * window.el (window-resizable--p): Rename to window-resizable-p. + (window-resize-no-error): New function. + + * mail/rmail.el (rmail-maybe-display-summary): Restore behavior + broken in fix from 2012-12-28. + 2012-12-31 Stefan Monnier * subr.el (special-form-p): Don't signal errors on undef aliases. === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2012-12-31 11:20:58 +0000 +++ lisp/mail/rmail.el 2012-12-31 11:35:13 +0000 @@ -4224,15 +4224,25 @@ ;; Put the summary buffer back on the screen, if user wants that. (defun rmail-maybe-display-summary () - ;; If requested, make sure the summary is displayed. - (when (and rmail-summary-buffer (buffer-name rmail-summary-buffer) - rmail-redisplay-summary) + (cond + ((or (not rmail-summary-buffer) + (not (buffer-name rmail-summary-buffer)))) + (rmail-redisplay-summary + ;; If `rmail-redisplay-summary' is non-nil, make sure the summary + ;; buffer is displayed. (display-buffer rmail-summary-buffer `(nil (reusable-frames . 0) ,(when rmail-summary-window-size - `(window-height . ,rmail-summary-window-size)))))) + `(window-height . ,rmail-summary-window-size))))) + (rmail-summary-window-size + ;; If `rmail-summary-window-size' is non-nil and the summary buffer + ;; is displayed, make sure it gets resized. + (let ((window (get-buffer-window rmail-summary-buffer 0))) + (when window + (window-resize-no-error + window (- rmail-summary-window-size (window-height window)))))))) ;;;; *** Rmail Local Fontification *** === modified file 'lisp/window.el' --- lisp/window.el 2012-11-19 03:16:03 +0000 +++ lisp/window.el 2012-12-31 11:35:13 +0000 @@ -1340,7 +1340,7 @@ delta)) (t 0))) -(defun window--resizable-p (window delta &optional horizontal ignore trail noup nodown) +(defun window-resizable-p (window delta &optional horizontal ignore trail noup nodown) "Return t if WINDOW can be resized vertically by DELTA lines. WINDOW must be a valid window and defaults to the selected one. For the meaning of the arguments of this function see the @@ -1943,7 +1943,7 @@ ;; nil or the minibuffer window is active, resize the minibuffer ;; window. (window--resize-mini-window minibuffer-window (- delta))) - ((window--resizable-p window delta horizontal ignore) + ((window-resizable-p window delta horizontal ignore) (window--resize-reset frame horizontal) (window--resize-this-window window delta horizontal ignore t) (if (and (not window-combination-resize) @@ -1969,6 +1969,14 @@ (t (error "Cannot resize window %s" window))))) +(defun window-resize-no-error (window delta &optional horizontal ignore) + "Resize WINDOW vertically if it is resizable by DELTA lines. +This function is like `window-resize' but does not signal an +error when WINDOW cannot be resized. For the meaning of the +optional arguments see the documentation of `window-resize'." + (when (window-resizable-p window delta horizontal ignore) + (window-resize window delta horizontal ignore))) + (defun window--resize-child-windows-skip-p (window) "Return non-nil if WINDOW shall be skipped by resizing routines." (memq (window-new-normal window) '(ignore stuck skip))) @@ -2594,7 +2602,7 @@ ;; If the selected window is full height and `resize-mini-windows' ;; is nil, resize the minibuffer window. (window--resize-mini-window minibuffer-window (- delta))) - ((window--resizable-p nil delta horizontal) + ((window-resizable-p nil delta horizontal) (window-resize nil delta horizontal)) (t (window-resize @@ -2627,7 +2635,7 @@ ;; If the selected window is full height and `resize-mini-windows' ;; is nil, resize the minibuffer window. (window--resize-mini-window minibuffer-window delta)) - ((window--resizable-p nil (- delta) horizontal) + ((window-resizable-p nil (- delta) horizontal) (window-resize nil (- delta) horizontal)) (t (window-resize @@ -2901,7 +2909,7 @@ (set-window-new-normal sibling (+ (window-normal-size sibling horizontal) (window-normal-size window horizontal)))) - ((window--resizable-p window (- size) horizontal nil nil nil t) + ((window-resizable-p window (- size) horizontal nil nil nil t) ;; Can do without resizing fixed-size windows. (window--resize-siblings window (- size) horizontal)) (t @@ -4440,13 +4448,13 @@ (let ((delta (- (cdr (assq 'total-height item)) (window-total-height window))) window-size-fixed) - (when (window--resizable-p window delta) + (when (window-resizable-p window delta) (window-resize window delta))) ;; Else check whether the window is not high enough. (let* ((min-size (window-min-size window nil ignore)) (delta (- min-size (window-total-size window)))) (when (and (> delta 0) - (window--resizable-p window delta nil ignore)) + (window-resizable-p window delta nil ignore)) (window-resize window delta nil ignore)))) ;; Adjust horizontally. (if (memq window-size-fixed '(t width)) @@ -4454,13 +4462,13 @@ (let ((delta (- (cdr (assq 'total-width item)) (window-total-width window))) window-size-fixed) - (when (window--resizable-p window delta) + (when (window-resizable-p window delta) (window-resize window delta))) ;; Else check whether the window is not wide enough. (let* ((min-size (window-min-size window t ignore)) (delta (- min-size (window-total-size window t)))) (when (and (> delta 0) - (window--resizable-p window delta t ignore)) + (window-resizable-p window delta t ignore)) (window-resize window delta t ignore)))) ;; Set dedicated status. (set-window-dedicated-p window (cdr (assq 'dedicated state))) @@ -5211,7 +5219,7 @@ (* (window-total-size (frame-root-window window)) height)))) (delta (- new-height (window-total-size window)))) - (when (and (window--resizable-p window delta nil 'safe) + (when (and (window-resizable-p window delta nil 'safe) (window-combined-p window)) (window-resize window delta nil 'safe)))) ((functionp height) @@ -5227,7 +5235,7 @@ (* (window-total-size (frame-root-window window) t) width)))) (delta (- new-width (window-total-size window t)))) - (when (and (window--resizable-p window delta t 'safe) + (when (and (window-resizable-p window delta t 'safe) (window-combined-p window t)) (window-resize window delta t 'safe)))) ((functionp width) ------------------------------------------------------------ revno: 111387 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-12-31 06:20:58 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2012-12-30 18:09:01 +0000 +++ lisp/mail/rmail.el 2012-12-31 11:20:58 +0000 @@ -4622,7 +4622,7 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "f1937f85a1258de8880a089fa5ae5621") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "c106528cab2def0306822563a9083967") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ ------------------------------------------------------------ revno: 111386 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-12-31 06:17:37 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-12-30 18:09:01 +0000 +++ autogen/Makefile.in 2012-12-31 11:17:37 +0000 @@ -561,6 +561,7 @@ LIBS = @LIBS@ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ LIBSOUND = @LIBSOUND@ +LIBS_GNUSTEP = @LIBS_GNUSTEP@ LIBS_MAIL = @LIBS_MAIL@ LIBS_SYSTEM = @LIBS_SYSTEM@ LIBS_TERMCAP = @LIBS_TERMCAP@ @@ -763,7 +764,6 @@ STRIP = @STRIP@ SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ TERMCAP_OBJ = @TERMCAP_OBJ@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ TOOLKIT_LIBW = @TOOLKIT_LIBW@ === modified file 'autogen/config.in' --- autogen/config.in 2012-12-17 11:17:34 +0000 +++ autogen/config.in 2012-12-31 11:17:37 +0000 @@ -479,12 +479,18 @@ /* Define to 1 if you have the `gtk_file_selection_new' function. */ #undef HAVE_GTK_FILE_SELECTION_NEW +/* Define to 1 if you have the `gtk_handle_box_new' function. */ +#undef HAVE_GTK_HANDLE_BOX_NEW + /* Define to 1 if you have the `gtk_main' function. */ #undef HAVE_GTK_MAIN /* Define to 1 if you have the `gtk_orientable_set_orientation' function. */ #undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION +/* Define to 1 if you have the `gtk_tearoff_menu_item_new' function. */ +#undef HAVE_GTK_TEAROFF_MENU_ITEM_NEW + /* Define to 1 if you have the `gtk_widget_get_mapped' function. */ #undef HAVE_GTK_WIDGET_GET_MAPPED === modified file 'autogen/configure' --- autogen/configure 2012-12-30 18:09:01 +0000 +++ autogen/configure 2012-12-31 11:17:37 +0000 @@ -1237,7 +1237,7 @@ NS_OBJ ns_self_contained INSTALL_ARCH_INDEP_EXTRA -TEMACS_LDFLAGS2 +LIBS_GNUSTEP LD_SWITCH_X_SITE_RPATH XMKMF DEPFLAGS @@ -1411,6 +1411,7 @@ enable_check_lisp_object_type enable_profiling enable_autodepend +enable_gtk_deprecation_warnings enable_dependency_tracking enable_largefile enable_gcc_warnings @@ -2070,6 +2071,8 @@ --enable-autodepend automatically generate dependencies to .h-files. Requires GNU Make and Gcc. Enabled if GNU Make and Gcc is found + --enable-gtk-deprecation-warnings + Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0 --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-largefile omit support for large files @@ -4396,6 +4399,12 @@ fi +# Check whether --enable-gtk-deprecation-warnings was given. +if test "${enable_gtk_deprecation_warnings+set}" = set; then : + enableval=$enable_gtk_deprecation_warnings; ac_enable_gtk_deprecation_warnings="${enableval}" +fi + + #### Make srcdir absolute, if it isn't already. It's important to #### avoid running the file name through pwd unnecessarily, since pwd can #### give you automounter prefixes, which can go away. We do all this @@ -9511,8 +9520,8 @@ tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" -TEMACS_LDFLAGS2="\${LDFLAGS}" GNU_OBJC_CFLAGS= +LIBS_GNUSTEP= if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes @@ -9537,9 +9546,9 @@ CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}" + LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread" LIB_STANDARD= START_FILES= - TEMACS_LDFLAGS2= { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS" >&5 $as_echo_n "checking if GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS... " >&6; } if test "${emacs_cv_objc_exceptions+set}" = set; then : @@ -10854,6 +10863,9 @@ GTK_OBJ=emacsgtkfixed.o term_header=gtkutil.h USE_GTK_TOOLKIT="GTK3" + if test "x$ac_enable_gtk_deprecation_warnings" = x; then + GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" + fi else check_gtk2=yes gtk3_pkg_errors="$GTK_PKG_ERRORS " @@ -11003,6 +11015,53 @@ fi + HAVE_GTK_HANDLE_BOX=no + ac_fn_c_check_decl "$LINENO" "GTK_TYPE_HANDLE_BOX" "ac_cv_have_decl_GTK_TYPE_HANDLE_BOX" "$ac_includes_default +#include +" +if test "x$ac_cv_have_decl_GTK_TYPE_HANDLE_BOX" = x""yes; then : + HAVE_GTK_HANDLE_BOX=yes +else + HAVE_GTK_HANDLE_BOX=no +fi + + if test "$HAVE_GTK_HANDLE_BOX" = yes; then + for ac_func in gtk_handle_box_new +do : + ac_fn_c_check_func "$LINENO" "gtk_handle_box_new" "ac_cv_func_gtk_handle_box_new" +if test "x$ac_cv_func_gtk_handle_box_new" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GTK_HANDLE_BOX_NEW 1 +_ACEOF + +fi +done + + fi + + HAVE_GTK_TEAROFF_MENU_ITEM=no + ac_fn_c_check_decl "$LINENO" "GTK_TYPE_TEAROFF_MENU_ITEM" "ac_cv_have_decl_GTK_TYPE_TEAROFF_MENU_ITEM" "$ac_includes_default +#include +" +if test "x$ac_cv_have_decl_GTK_TYPE_TEAROFF_MENU_ITEM" = x""yes; then : + HAVE_GTK_TEAROFF_MENU_ITEM=yes +else + HAVE_GTK_TEAROFF_MENU_ITEM=no +fi + + if test "$HAVE_GTK_TEAROFF_MENU_ITEM" = yes; then + for ac_func in gtk_tearoff_menu_item_new +do : + ac_fn_c_check_func "$LINENO" "gtk_tearoff_menu_item_new" "ac_cv_func_gtk_tearoff_menu_item_new" +if test "x$ac_cv_func_gtk_tearoff_menu_item_new" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GTK_TEAROFF_MENU_ITEM_NEW 1 +_ACEOF + +fi +done + + fi for ac_func in gtk_widget_get_window gtk_widget_set_has_window \ gtk_dialog_get_action_area gtk_widget_get_sensitive \ @@ -25786,10 +25845,6 @@ *) LD_SWITCH_SYSTEM_TEMACS= ;; esac -if test "$NS_IMPL_GNUSTEP" = "yes"; then - LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" -fi - ------------------------------------------------------------ revno: 111385 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2012-12-30 23:43:35 -0500 message: * lisp/subr.el (special-form-p): Don't signal errors on undef aliases. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-12-31 02:58:57 +0000 +++ lisp/ChangeLog 2012-12-31 04:43:35 +0000 @@ -1,8 +1,12 @@ +2012-12-31 Stefan Monnier + + * subr.el (special-form-p): Don't signal errors on undef aliases. + 2012-12-31 Jay Belanger * calc/calc-forms.el (math-parse-date): Try using - `math-parse-iso-date' when it looks like it might be needed. Allow - times of 24:00. + `math-parse-iso-date' when it looks like it might be needed. + Allow times of 24:00. (math-parse-date-validate, math-parse-iso-date-validate): Allow times of 24:00. @@ -25,8 +29,8 @@ 2012-12-30 Mark Lillibridge - * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert - the undecoded text of the message being forwarded. (Bug#9521) + * mail/rmailmm.el (rmail-insert-mime-forwarded-message): + Insert the undecoded text of the message being forwarded. (Bug#9521) 2012-12-30 Michael Albinus @@ -36,8 +40,8 @@ * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context): Return `t' on success. - * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add - handler for `set-file-selinux-context'. + * net/tramp-smb.el (tramp-smb-file-name-handler-alist): + Add handler for `set-file-selinux-context'. 2012-12-29 Michael Albinus @@ -46,8 +50,8 @@ 2012-12-29 Eli Zaretskii - * files.el (backup-buffer-copy, basic-save-buffer-2): If - set-file-extended-attributes fails, fall back on set-file-modes + * files.el (backup-buffer-copy, basic-save-buffer-2): + If set-file-extended-attributes fails, fall back on set-file-modes instead of signaling an error. (Bug#13298) (basic-save-buffer): Likewise. @@ -75,8 +79,8 @@ 2012-12-28 Martin Rudalics - * mail/rmail.el (rmail-maybe-display-summary): Rewrite - (Bug#13066). + * mail/rmail.el (rmail-maybe-display-summary): + Rewrite (Bug#13066). 2012-12-28 Andreas Schwab @@ -131,8 +135,8 @@ 2012-12-27 Dmitry Gutov * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class", - "module" and "def" to have indentation before them. Regression - from revno:109911 (see the new test). + "module" and "def" to have indentation before them. + Regression from revno:109911 (see the new test). * progmodes/ruby-mode.el: Bump the version to 1.2 (Bug#13200). @@ -145,8 +149,8 @@ 2012-12-27 Vitalie Spinu (tiny change) * comint.el (comint-adjust-window-point): New function. - (comint-postoutput-scroll-to-bottom): Call - comint-adjust-window-point (Bug#13248). + (comint-postoutput-scroll-to-bottom): + Call comint-adjust-window-point (Bug#13248). 2012-12-26 Dmitry Gutov @@ -157,8 +161,8 @@ 2012-12-26 Jürgen Hötzel - * net/tramp-adb.el (tramp-adb-get-ls-command): New defun. Suppress - coloring, if possible (required for BusyBox based systems like + * net/tramp-adb.el (tramp-adb-get-ls-command): New defun. + Suppress coloring, if possible (required for BusyBox based systems like CynagenMod). (tramp-adb-handle-file-attributes) (tramp-adb-handle-insert-directory) @@ -187,8 +191,8 @@ * notifications.el (notifications-notify): Protect body with `with-demoted-errors'. - * net/tramp-adb.el (tramp-adb-maybe-open-connection): Check - properties of remote device. Restart connection, if there is a + * net/tramp-adb.el (tramp-adb-maybe-open-connection): + Check properties of remote device. Restart connection, if there is a change. 2012-12-21 Chong Yidong === modified file 'lisp/subr.el' --- lisp/subr.el 2012-12-10 12:08:02 +0000 +++ lisp/subr.el 2012-12-31 04:43:35 +0000 @@ -2805,7 +2805,7 @@ (defun special-form-p (object) "Non-nil if and only if OBJECT is a special form." (if (and (symbolp object) (fboundp object)) - (setq object (indirect-function object))) + (setq object (indirect-function object t))) (and (subrp object) (eq (cdr (subr-arity object)) 'unevalled))) (defun field-at-pos (pos)