------------------------------------------------------------ revno: 117613 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-07-30 13:13:16 -0400 message: ChangeLog fix diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-07-30 16:25:58 +0000 +++ lisp/ChangeLog 2014-07-30 17:13:16 +0000 @@ -1,4 +1,4 @@ -2014-07-30 Christophe Deleuze +2014-07-30 Christophe Deleuze (tiny change) * calendar/icalendar.el (icalendar--decode-isodatetime): Use actual current-time-zone when converting to local time. (Bug#15408) ------------------------------------------------------------ revno: 117612 committer: Ulf Jasper branch nick: trunk timestamp: Wed 2014-07-30 18:25:58 +0200 message: Fix Bug#15408 (icalendar time zone problem) 2014-07-30 Christophe Deleuze * calendar/icalendar.el (icalendar--decode-isodatetime): Use actual current-time-zone when converting to local time. (Bug#15408) 2014-07-30 Ulf Jasper * automated/icalendar-tests.el (icalendar--decode-isodatetime): New test. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-07-29 15:08:30 +0000 +++ lisp/ChangeLog 2014-07-30 16:25:58 +0000 @@ -1,3 +1,8 @@ +2014-07-30 Christophe Deleuze + + * calendar/icalendar.el (icalendar--decode-isodatetime): Use + actual current-time-zone when converting to local time. (Bug#15408) + 2014-07-29 Martin Rudalics * window.el (window--state-put-2): Handle horizontal scroll === modified file 'lisp/calendar/icalendar.el' --- lisp/calendar/icalendar.el 2014-01-01 07:43:34 +0000 +++ lisp/calendar/icalendar.el 2014-07-30 16:25:58 +0000 @@ -563,7 +563,12 @@ ;; UTC specifier present (char-equal ?Z (aref isodatetimestring 15))) ;; if not UTC add current-time-zone offset - (setq second (+ (car (current-time-zone)) second))) + ;; current-time-zone should be called with actual UTC time + ;; (daylight saving at that time may differ to current one) + (setq second (+ (car (current-time-zone + (encode-time second minute hour day month year + 0))) + second))) ;; shift if necessary (if day-shift (let ((mdy (calendar-gregorian-from-absolute === modified file 'test/ChangeLog' --- test/ChangeLog 2014-07-28 06:28:15 +0000 +++ test/ChangeLog 2014-07-30 16:25:58 +0000 @@ -1,3 +1,7 @@ +2014-07-30 Ulf Jasper + + * automated/icalendar-tests.el (icalendar--decode-isodatetime): New test. + 2014-07-28 Dmitry Antipov * automated/timer-tests.el (timer-tests-debug-timer-check): New test. === modified file 'test/automated/icalendar-tests.el' --- test/automated/icalendar-tests.el 2014-07-26 12:53:36 +0000 +++ test/automated/icalendar-tests.el 2014-07-30 16:25:58 +0000 @@ -414,6 +414,38 @@ (should (not result)) )) +(ert-deftest icalendar--decode-isodatetime () + "Test `icalendar--decode-isodatetime'." + (let ((tz (getenv "TZ")) + result) + (unwind-protect + (progn + ;; Use Eastern European Time (UTC+1, UTC+2 daylight saving) + (setenv "TZ" "EET") + + (message "%s" (current-time-zone (encode-time 0 0 10 1 1 2013 0))) + (message "%s" (current-time-zone (encode-time 0 0 10 1 8 2013 0))) + + ;; testcase: no time zone in input -> keep time as is + ;; 1 Jan 2013 10:00 + (should (equal '(0 0 10 1 1 2013 2 nil 7200) + (icalendar--decode-isodatetime "20130101T100000"))) + ;; 1 Aug 2013 10:00 (DST) + (should (equal '(0 0 10 1 8 2013 4 t 10800) + (icalendar--decode-isodatetime "20130801T100000"))) + + ;; testcase: UTC time zone specifier in input -> convert to local time + ;; 31 Dec 2013 23:00 UTC -> 1 Jan 2013 01:00 EET + (should (equal '(0 0 1 1 1 2014 3 nil 7200) + (icalendar--decode-isodatetime "20131231T230000Z"))) + ;; 1 Aug 2013 10:00 UTC -> 1 Aug 2013 13:00 EEST + (should (equal '(0 0 13 1 8 2013 4 t 10800) + (icalendar--decode-isodatetime "20130801T100000Z"))) + + ) + ;; restore time-zone even if something went terribly wrong + (setenv "TZ" tz))) ) + ;; ====================================================================== ;; Export tests ;; ====================================================================== ------------------------------------------------------------ revno: 117611 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2014-07-30 08:03:45 +0400 message: * xterm.c (x_sync_with_move): Really wait 0.5s, not 0.0005s. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-07-30 03:41:56 +0000 +++ src/ChangeLog 2014-07-30 04:03:45 +0000 @@ -3,6 +3,7 @@ * xrdb.c (x_load_resources) [USE_MOTIF]: Although not strictly necessary, put horizontal scroll bar resources as well. See . + * xterm.c (x_sync_with_move): Really wait 0.5s, not 0.0005s. 2014-07-29 Dmitry Antipov === modified file 'src/xterm.c' --- src/xterm.c 2014-07-27 13:21:30 +0000 +++ src/xterm.c 2014-07-30 04:03:45 +0000 @@ -9351,7 +9351,7 @@ if (eabs (current_left - left) <= 10 && eabs (current_top - top) <= 40) return; - } + } else if (current_left == left && current_top == top) return; } @@ -9359,7 +9359,7 @@ /* As a last resort, just wait 0.5 seconds and hope that XGetGeometry will then return up-to-date position info. */ - wait_reading_process_output (0, 500000, 0, 0, Qnil, NULL, 0); + wait_reading_process_output (0, 500000000, 0, 0, Qnil, NULL, 0); } ------------------------------------------------------------ revno: 117610 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2014-07-30 07:41:56 +0400 message: * xrdb.c (x_load_resources) [USE_MOTIF]: Although not strictly necessary, put horizontal scroll bar resources as well. See . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-07-29 16:38:46 +0000 +++ src/ChangeLog 2014-07-30 03:41:56 +0000 @@ -1,3 +1,9 @@ +2014-07-30 Dmitry Antipov + + * xrdb.c (x_load_resources) [USE_MOTIF]: Although not strictly + necessary, put horizontal scroll bar resources as well. See + . + 2014-07-29 Dmitry Antipov * xrdb.c (x_load_resources) [!USE_MOTIF]: Put horizontal scroll bar === modified file 'src/xrdb.c' --- src/xrdb.c 2014-07-29 16:38:46 +0000 +++ src/xrdb.c 2014-07-30 03:41:56 +0000 @@ -452,6 +452,10 @@ XrmPutLineResource (&rdb, line); sprintf (line, "%s*verticalScrollBar.troughColor: grey75", myclass); XrmPutLineResource (&rdb, line); + sprintf (line, "%s*horizontalScrollBar.background: grey75", myclass); + XrmPutLineResource (&rdb, line); + sprintf (line, "%s*horizontalScrollBar.troughColor: grey75", myclass); + XrmPutLineResource (&rdb, line); sprintf (line, "%s.dialog*.background: grey75", myclass); XrmPutLineResource (&rdb, line); sprintf (line, "%s*fsb.Text.background: white", myclass); ------------------------------------------------------------ revno: 117609 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-07-29 20:38:46 +0400 message: * xrdb.c (x_load_resources) [!USE_MOTIF]: Put horizontal scroll bar background value to match the resource of its vertical counterpart. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-07-29 08:51:49 +0000 +++ src/ChangeLog 2014-07-29 16:38:46 +0000 @@ -1,3 +1,8 @@ +2014-07-29 Dmitry Antipov + + * xrdb.c (x_load_resources) [!USE_MOTIF]: Put horizontal scroll bar + background value to match the resource of its vertical counterpart. + 2014-07-29 Martin Rudalics * frame.c (adjust_frame_size): Use FRAME_WINDOW_P instead of === modified file 'src/xrdb.c' --- src/xrdb.c 2014-01-01 07:43:34 +0000 +++ src/xrdb.c 2014-07-29 16:38:46 +0000 @@ -499,6 +499,8 @@ XrmPutLineResource (&rdb, line); sprintf (line, "Emacs*verticalScrollBar.background: grey75"); XrmPutLineResource (&rdb, line); + sprintf (line, "Emacs*horizontalScrollBar.background: grey75"); + XrmPutLineResource (&rdb, line); #endif /* not USE_MOTIF */ ------------------------------------------------------------ revno: 117608 committer: martin rudalics branch nick: trunk timestamp: Tue 2014-07-29 17:08:30 +0200 message: In window--state-put-2 handle horizontal scroll bars. * window.el (window--state-put-2): Handle horizontal scroll bars, if present. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-07-29 14:21:11 +0000 +++ lisp/ChangeLog 2014-07-29 15:08:30 +0000 @@ -1,3 +1,8 @@ +2014-07-29 Martin Rudalics + + * window.el (window--state-put-2): Handle horizontal scroll + bars, if present. + 2014-07-29 Rüdiger Sonderfeld * menu-bar.el (menu-bar-update-buffers): Update item list format === modified file 'lisp/window.el' --- lisp/window.el 2014-07-28 09:39:09 +0000 +++ lisp/window.el 2014-07-29 15:08:30 +0000 @@ -5121,7 +5121,7 @@ (let ((scroll-bars (cdr (assq 'scroll-bars state)))) (set-window-scroll-bars window (car scroll-bars) (nth 2 scroll-bars) - (nth 3 scroll-bars))) + (or (nth 3 scroll-bars) 0) (nth 5 scroll-bars))) (set-window-vscroll window (cdr (assq 'vscroll state))) ;; Adjust vertically. (if (memq window-size-fixed '(t height)) ------------------------------------------------------------ revno: 117607 committer: R?diger Sonderfeld branch nick: trunk timestamp: Tue 2014-07-29 16:21:11 +0200 message: Fix Bug#18016. menu-bar.el (menu-bar-update-buffers): Update item list format in `buffers-menu' to confirm with changes to `get_keyelt' (r117463). (Bug#18016) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-07-28 21:07:10 +0000 +++ lisp/ChangeLog 2014-07-29 14:21:11 +0000 @@ -1,3 +1,9 @@ +2014-07-29 Rüdiger Sonderfeld + + * menu-bar.el (menu-bar-update-buffers): Update item list format + in `buffers-menu' to confirm with changes to `get_keyelt' + (r117463). (Bug#18016) + 2014-07-28 Fabián Ezequiel Gallina * progmodes/python.el (inferior-python-mode): Make input prompts === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2014-07-27 13:21:30 +0000 +++ lisp/menu-bar.el 2014-07-29 14:21:11 +0000 @@ -1988,11 +1988,10 @@ (dolist (pair alist) (setq i (1- i)) (aset buffers-vec i - (nconc (list (car pair) - (cons nil nil)) - `(lambda () - (interactive) - (funcall menu-bar-select-buffer-function ,(cdr pair)))))) + (cons (car pair) + `(lambda () + (interactive) + (funcall menu-bar-select-buffer-function ,(cdr pair)))))) (list buffers-vec)))) ;; Make a Frames menu if we have more than one frame. @@ -2004,10 +2003,8 @@ (i 0)) (dolist (frame frames) (aset frames-vec i - (nconc - (list - (frame-parameter frame 'name) - (cons nil nil)) + (cons + (frame-parameter frame 'name) `(lambda () (interactive) (menu-bar-select-frame ,frame)))) (setq i (1+ i))) ------------------------------------------------------------ revno: 117606 committer: martin rudalics branch nick: trunk timestamp: Tue 2014-07-29 10:51:49 +0200 message: In adjust_frame_size use FRAME_WINDOW_P instead of FRAME_X_WINDOW (Bug#18138). * frame.c (adjust_frame_size): Use FRAME_WINDOW_P instead of FRAME_X_WINDOW when calling x_set_window_size (Bug#18138). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-07-28 17:03:23 +0000 +++ src/ChangeLog 2014-07-29 08:51:49 +0000 @@ -1,3 +1,8 @@ +2014-07-29 Martin Rudalics + + * frame.c (adjust_frame_size): Use FRAME_WINDOW_P instead of + FRAME_X_WINDOW when calling x_set_window_size (Bug#18138). + 2014-07-28 Martin Rudalics * frame.c (x_set_frame_parameters): Revert part of 2014-07-24 === modified file 'src/frame.c' --- src/frame.c 2014-07-28 17:03:23 +0000 +++ src/frame.c 2014-07-29 08:51:49 +0000 @@ -484,7 +484,7 @@ new_lines = new_text_height / unit_height; #ifdef HAVE_WINDOW_SYSTEM - if (FRAME_X_WINDOW (f) + if (FRAME_WINDOW_P (f) && f->official && ((!inhibit_horizontal && (new_pixel_width != old_pixel_width ------------------------------------------------------------ revno: 117605 committer: Fabi?n Ezequiel Gallina branch nick: trunk timestamp: Mon 2014-07-28 18:07:10 -0300 message: * lisp/progmodes/python.el (inferior-python-mode): Make input prompts read-only. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-07-28 19:14:21 +0000 +++ lisp/ChangeLog 2014-07-28 21:07:10 +0000 @@ -1,3 +1,8 @@ +2014-07-28 Fabián Ezequiel Gallina + + * progmodes/python.el (inferior-python-mode): Make input prompts + read-only. + 2014-07-28 Emilio C. Lopes * net/tramp-sh.el (tramp-get-remote-python): Also search for === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2014-07-28 09:39:09 +0000 +++ lisp/progmodes/python.el 2014-07-28 21:07:10 +0000 @@ -2357,7 +2357,8 @@ (set (make-local-variable 'python-shell--prompt-calculated-input-regexp) nil) (set (make-local-variable 'python-shell--prompt-calculated-output-regexp) nil) (python-shell-prompt-set-calculated-regexps) - (setq comint-prompt-regexp python-shell--prompt-calculated-input-regexp) + (setq comint-prompt-regexp python-shell--prompt-calculated-input-regexp + comint-prompt-read-only t) (setq mode-line-process '(":%s")) (set (make-local-variable 'comint-output-filter-functions) '(ansi-color-process-output @@ -2381,6 +2382,10 @@ (compilation-shell-minor-mode 1) ;; Ensure all the output is accepted before running any hooks. (accept-process-output (get-buffer-process (current-buffer))) + ;; At this point, all process output should have been received, but + ;; on GNU/Linux, calling `python-shell-internal-send-string' without + ;; a running internal shell fails to grab output properly unless + ;; this `sit-for' is in place. (sit-for 0.1 t)) (defun python-shell-make-comint (cmd proc-name &optional pop internal)