------------------------------------------------------------ revno: 115119 fixes bug: http://debbugs.gnu.org/15907 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-16 11:27:19 +0200 message: Fix bug #15907 with crashes due to after-change-functions. src/keymap.c (describe_map): Don't crash if PT is 1 both before and after inserting the description string. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-15 18:01:04 +0000 +++ src/ChangeLog 2013-11-16 09:27:19 +0000 @@ -1,3 +1,8 @@ +2013-11-16 Eli Zaretskii + + * keymap.c (describe_map): Don't crash if PT is 1 both before and + after inserting the description string. (Bug#15907) + 2013-11-15 Paul Eggert * data.c: Work around bogus GCC diagnostic about shift count. === modified file 'src/keymap.c' --- src/keymap.c 2013-08-11 01:30:20 +0000 +++ src/keymap.c 2013-11-16 09:27:19 +0000 @@ -3383,9 +3383,12 @@ if (vect[i].shadowed) { - SET_PT (PT - 1); + ptrdiff_t pt = max (PT - 1, BEG); + + SET_PT (pt); insert_string ("\n (that binding is currently shadowed by another mode)"); - SET_PT (PT + 1); + pt = min (PT + 1, Z); + SET_PT (pt); } } ------------------------------------------------------------ revno: 115118 committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2013-11-15 20:09:10 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): End regexp for nil/self/true/false with "end of symbol". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-15 10:02:13 +0000 +++ lisp/ChangeLog 2013-11-15 18:09:10 +0000 @@ -1,3 +1,8 @@ +2013-11-15 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): End regexp for + nil/self/true/false with "end of symbol". + 2013-11-15 Bozhidar Batsov * subr.el (version-regexp-alist): Fix a typo. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-14 12:39:41 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-15 18:09:10 +0000 @@ -1925,7 +1925,7 @@ "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$" ;; Variables. (,(concat ruby-font-lock-keyword-beg-re - "\\_<\\(nil\\|self\\|true\\|false\\)\\>") + "\\_<\\(nil\\|self\\|true\\|false\\)\\_>") 1 font-lock-variable-name-face) ;; Keywords that evaluate to certain values. ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" ------------------------------------------------------------ revno: 115117 committer: Paul Eggert branch nick: trunk timestamp: Fri 2013-11-15 10:01:04 -0800 message: * data.c: Work around bogus GCC diagnostic about shift count. Reported by Eli Zaretskii in . (pre_value): New function. (count_trailing_zero_bits): Use it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-15 08:18:37 +0000 +++ src/ChangeLog 2013-11-15 18:01:04 +0000 @@ -1,3 +1,11 @@ +2013-11-15 Paul Eggert + + * data.c: Work around bogus GCC diagnostic about shift count. + Reported by Eli Zaretskii in + . + (pre_value): New function. + (count_trailing_zero_bits): Use it. + 2013-11-15 Eli Zaretskii * lisp.h (DEBUGGER_SEES_C_MACROS) [GCC < v3.5]: Pessimistically === modified file 'src/data.c' --- src/data.c 2013-11-14 02:39:28 +0000 +++ src/data.c 2013-11-15 18:01:04 +0000 @@ -3078,6 +3078,16 @@ return changed ? dest : Qnil; } +/* PRECONDITION must be true. Return VALUE. This odd construction + works around a bogus GCC diagnostic "shift count >= width of type". */ + +static int +pre_value (bool precondition, int value) +{ + eassume (precondition); + return precondition ? value : 0; +} + /* Compute the number of trailing zero bits in val. If val is zero, return the number of bits in val. */ static int @@ -3111,7 +3121,8 @@ if (BITS_PER_BITS_WORD % BITS_PER_ULL != 0 && BITS_WORD_MAX == (bits_word) -1) - val |= (bits_word) 1 << (BITS_PER_BITS_WORD % BITS_PER_ULL); + val |= (bits_word) 1 << pre_value (ULONG_MAX < BITS_WORD_MAX, + BITS_PER_BITS_WORD % BITS_PER_ULL); return count + count_trailing_zeros_ll (val); } } ------------------------------------------------------------ revno: 115116 committer: Michael Albinus branch nick: trunk timestamp: Fri 2013-11-15 14:49:17 +0100 message: * automated/tramp-tests.el (tramp-test29-utf8): Cleanup the connection before running the test. Reenable last test case. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2013-11-15 08:03:19 +0000 +++ test/ChangeLog 2013-11-15 13:49:17 +0000 @@ -1,5 +1,10 @@ 2013-11-15 Michael Albinus + * automated/tramp-tests.el (tramp-test29-utf8): Cleanup the + connection before running the test. + +2013-11-15 Michael Albinus + * automated/tramp-tests.el (tramp-test15-copy-directory) (tramp-test16-directory-files, tramp-test17-insert-directory) (tramp-test18-file-attributes) === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2013-11-15 08:28:42 +0000 +++ test/automated/tramp-tests.el 2013-11-15 13:49:17 +0000 @@ -1067,8 +1067,12 @@ (ert-deftest tramp-test29-utf8 () "Check UTF8 encoding in file names and file contents." (skip-unless (tramp--test-enabled)) + ;; TODO: It shall be possible to call it in every test. + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) (let ((tmp-name (tramp--test-make-temp-name)) - (arabic "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت.") + (arabic "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت") (chinese "银河系漫游指南系列") (russian "Автостопом по гала́ктике")) (unwind-protect @@ -1083,9 +1087,9 @@ (insert-file-contents file) (should (string-equal (buffer-string) lang))))) ;; Check file name. -; (should (equal (directory-files -; tmp-name nil directory-files-no-dot-files-regexp) -); (sort `(,arabic ,chinese ,russian) 'string-lessp)))) + (should (equal (directory-files + tmp-name nil directory-files-no-dot-files-regexp) + (sort `(,arabic ,chinese ,russian) 'string-lessp)))) (ignore-errors (delete-directory tmp-name 'recursive))))) ;; TODO: ------------------------------------------------------------ revno: 115115 committer: Bozhidar Batsov branch nick: master timestamp: Fri 2013-11-15 12:02:13 +0200 message: * lisp/subr.el (version-regexp-alist): Fix a typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-15 07:37:18 +0000 +++ lisp/ChangeLog 2013-11-15 10:02:13 +0000 @@ -1,3 +1,7 @@ +2013-11-15 Bozhidar Batsov + + * subr.el (version-regexp-alist): Fix a typo. + 2013-11-15 Michael Albinus * net/tramp-sh.el (tramp-remote-process-environment): Set "LC_ALL" to === modified file 'lisp/subr.el' --- lisp/subr.el 2013-11-14 17:07:03 +0000 +++ lisp/subr.el 2013-11-15 10:02:13 +0000 @@ -4477,7 +4477,7 @@ ("^[-_+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)$" . -4) ("^[-_+ ]?alpha$" . -3) ("^[-_+ ]?beta$" . -2) - ("^[-_+ ]?\\(pre\\|rcc\\)$" . -1)) + ("^[-_+ ]?\\(pre\\|rc\\)$" . -1)) "Specify association between non-numeric version and its priority. This association is used to handle version string like \"1.0pre2\", ------------------------------------------------------------ revno: 115114 committer: Michael Albinus branch nick: trunk timestamp: Fri 2013-11-15 09:28:42 +0100 message: * automated/tramp-tests.el (tramp-test29-utf8): Comment last test case, it fails in batch mode. Needs further investigations. diff: === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2013-11-15 08:03:19 +0000 +++ test/automated/tramp-tests.el 2013-11-15 08:28:42 +0000 @@ -1083,9 +1083,9 @@ (insert-file-contents file) (should (string-equal (buffer-string) lang))))) ;; Check file name. - (should (equal (directory-files - tmp-name nil directory-files-no-dot-files-regexp) - (sort `(,arabic ,chinese ,russian) 'string-lessp)))) +; (should (equal (directory-files +; tmp-name nil directory-files-no-dot-files-regexp) +); (sort `(,arabic ,chinese ,russian) 'string-lessp)))) (ignore-errors (delete-directory tmp-name 'recursive))))) ;; TODO: