------------------------------------------------------------ revno: 116063 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-01-17 20:51:38 -0500 message: ChangeLog and Author: header comment fixes diff: === modified file 'lisp/org/ob-makefile.el' --- lisp/org/ob-makefile.el 2014-01-01 07:43:34 +0000 +++ lisp/org/ob-makefile.el 2014-01-18 01:51:38 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2014 Free Software Foundation, Inc. -;; Author: Eric Schulte and Thomas S. Dye +;; Author: Eric Schulte +;; Thomas S. Dye ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org === modified file 'lisp/org/ob-scheme.el' --- lisp/org/ob-scheme.el 2014-01-01 07:43:34 +0000 +++ lisp/org/ob-scheme.el 2014-01-18 01:51:38 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2010-2014 Free Software Foundation, Inc. -;; Authors: Eric Schulte, Michael Gauland +;; Authors: Eric Schulte +;; Michael Gauland ;; Keywords: literate programming, reproducible research, scheme ;; Homepage: http://orgmode.org === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-17 11:55:00 +0000 +++ src/ChangeLog 2014-01-18 01:51:38 +0000 @@ -8607,7 +8607,7 @@ (FRAME_SCROLL_BOTTOM_VPOS): Remove. * xdisp.c (redisplay_internal): Adjust user. -2013-03-30 Darren Ho (tiny change) +2013-03-30 Darren Hoo (tiny change) * nsmenu.m (showAtX:Y:for:): setLevel to NSPopUpMenuWindowLevel (Bug#13998). === modified file 'test/automated/eieio-test-methodinvoke.el' --- test/automated/eieio-test-methodinvoke.el 2014-01-01 07:43:34 +0000 +++ test/automated/eieio-test-methodinvoke.el 2014-01-18 01:51:38 +0000 @@ -1,9 +1,8 @@ ;;; eieio-testsinvoke.el -- eieio tests for method invocation -;; Copyright (C) 2005, 2008, 2010, 2013-2014 Free Software Foundation, -;; Inc. +;; Copyright (C) 2005, 2008, 2010, 2013-2014 Free Software Foundation, Inc. -;; Author: Eric. M. Ludlam +;; Author: Eric M. Ludlam ;; This file is part of GNU Emacs. ------------------------------------------------------------ revno: 116062 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-01-17 20:50:56 -0500 message: * lisp/emacs-lisp/authors.el (authors-aliases): Add more entries diff: === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2014-01-18 01:29:25 +0000 +++ lisp/emacs-lisp/authors.el 2014-01-18 01:50:56 +0000 @@ -67,6 +67,7 @@ ("Emilio C. Lopes" "Emilio Lopes") ("Eric M. Ludlam" "Eric Ludlam") ("Eric S. Raymond" "Eric Raymond") + ("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina") ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright") ("François Pinard" "Francois Pinard") ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`") @@ -134,6 +135,7 @@ ("Richard King" "Dick King") ("Richard M. Stallman" "Richard Stallman" "rms@gnu.org") ("Robert J. Chassell" "Bob Chassell") + ("Roberto Huelga Díaz" "Roberto Huelga") ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts") ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}") ("Sacha Chua" "Sandra Jean Chua") ------------------------------------------------------------ revno: 116061 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-01-17 20:29:25 -0500 message: Add some entries to authors.el variables * lisp/emacs-lisp/authors.el (authors-aliases) (authors-renamed-files-alist): Add some entries. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-17 18:20:39 +0000 +++ lisp/ChangeLog 2014-01-18 01:29:25 +0000 @@ -1,3 +1,8 @@ +2014-01-18 Glenn Morris + + * emacs-lisp/authors.el (authors-aliases) + (authors-renamed-files-alist): Add some entries. + 2014-01-17 Michael Albinus * net/tramp.el (tramp-password-prompt-regexp): Use === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2014-01-17 03:21:57 +0000 +++ lisp/emacs-lisp/authors.el 2014-01-18 01:29:25 +0000 @@ -54,6 +54,7 @@ ("Brian P Templeton" "BT Templeton") ("Brian Sniffen" "Brian T. Sniffen") ("David Abrahams" "Dave Abrahams") + ("David J. Biesack" "David Biesack") ("David De La Harpe Golden" "David Golden") ("David Gillespie" "Dave Gillespie") ("David Kågedal" "David K..edal") @@ -62,7 +63,7 @@ ("David O'Toole" "David T. O'Toole") ("Deepak Goel" "D. Goel") ("Ed L. Cashin" "Ed L Cashin") - ("Edward M. Reingold" "Ed Reingold" "Edward M Reingold" "Reingold Edward M") + ("Edward M. Reingold" "Ed\\(ward\\( M\\)?\\)? Reingold" "Reingold Edward M") ("Emilio C. Lopes" "Emilio Lopes") ("Eric M. Ludlam" "Eric Ludlam") ("Eric S. Raymond" "Eric Raymond") @@ -96,13 +97,14 @@ ("Károly Lőrentey" "Károly Lőrentey" "Lőrentey Károly") ("Kazushi Marukawa" "Kazushi (Jam) Marukawa") ("Ken Manheimer" "Kenneth Manheimer") - ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA") + ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA" "K\\. Handa") ("Kevin Greiner" "Kevin J. Greiner") ("Kim F. Storm" "Kim Storm") ("Kyle Jones" "Kyle E. Jones") ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen") ("Marcus G. Daniels" "Marcus Daniels") ("Mark D. Baushke" "Mark D Baushke") + ("Mark E. Shoulson" "Mark Shoulson") ("Marko Kohtala" "Kohtala Marko") ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo") ("Martin Lorentzon" "Martin Lorentzson") @@ -736,6 +738,11 @@ ("org-export-latex.el" . "ox-latex.el") ; ? ("org-exp.el" . "ox.el") ; ? ("progmodes/cfengine3.el" . "cfengine.el") + ("progmodes/delphi.el" . "opascal.el") + ("octave-inf.el" . "octave.el") + ("octave-mod.el" . "octave.el") + ("progmodes/octave-inf.el" . "octave.el") + ("progmodes/octave-mod.el" . "octave.el") ;; Obsolete. ("play/bruce.el" . "bruce.el") ("patcomp.el" . "patcomp.el") ------------------------------------------------------------ revno: 116060 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-01-17 20:27:51 -0500 message: ChangeLog fixes diff: === modified file 'lisp/ChangeLog.8' --- lisp/ChangeLog.8 2014-01-15 03:06:07 +0000 +++ lisp/ChangeLog.8 2014-01-18 01:27:51 +0000 @@ -9222,8 +9222,9 @@ 1998-09-27 Kurt Hornik - * octave-inf.el (inferior-octave-prompt): Also match prompts of the - form `octave.bin:1>' which come from using precompiled binary versions. + * progmodes/octave-inf.el (inferior-octave-prompt): + Also match prompts of the form `octave.bin:1>', + which come from using precompiled binary versions. 1998-09-27 Richard Stallman === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2014-01-17 01:54:23 +0000 +++ lisp/ChangeLog.9 2014-01-18 01:27:51 +0000 @@ -19245,7 +19245,7 @@ * mouse.el (mouse-drag-region): Don't run up-event handler if hscroll has changed. - * octave-mod.el (octave-font-lock-keywords): To font-lock the + * progmodes/octave-mod.el (octave-font-lock-keywords): To font-lock the builtin operators, use `font-lock-builtin-face' for Emacs and `font-lock-preprocessor-face' otherwise. @@ -19928,8 +19928,8 @@ 2000-02-09 Ray Blaak - * delphi.el: Make resourcestring a declaration region, like const - and var. + * progmodes/delphi.el: Make resourcestring a declaration region, + like const and var. 2000-02-09 Dave Love ------------------------------------------------------------ revno: 116059 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-01-17 19:24:09 +0100 message: Add :version tag to `tramp-password-prompt-regexp'. diff: === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2014-01-17 18:20:39 +0000 +++ lisp/net/tramp.el 2014-01-17 18:24:09 +0000 @@ -574,6 +574,7 @@ The regexp should match at end of buffer. The `sudo' program appears to insert a `^@' character into the prompt." + :version "24.4" :group 'tramp :type 'regexp) ------------------------------------------------------------ revno: 116058 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-01-17 19:20:39 +0100 message: Fix Bug#13124. * net/tramp.el (tramp-password-prompt-regexp): Use `password-word-equivalents' if available. (tramp-action-password, tramp-process-one-action) (tramp-read-passwd): Let-bind `case-fold-search' to t. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-17 16:45:45 +0000 +++ lisp/ChangeLog 2014-01-17 18:20:39 +0000 @@ -1,3 +1,10 @@ +2014-01-17 Michael Albinus + + * net/tramp.el (tramp-password-prompt-regexp): Use + `password-word-equivalents' if available. + (tramp-action-password, tramp-process-one-action) + (tramp-read-passwd): Let-bind `case-fold-search' to t. (Bug#13124) + 2014-01-17 Chong Yidong * simple.el (password-word-equivalents): New defcustom. === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2014-01-01 07:43:34 +0000 +++ lisp/net/tramp.el 2014-01-17 18:20:39 +0000 @@ -566,7 +566,10 @@ :type 'regexp) (defcustom tramp-password-prompt-regexp - "^.*\\([pP]assword\\|[pP]assphrase\\).*:\^@? *" + (format "^.*\\(%s\\).*:\^@? *" + (if (boundp 'password-word-equivalents) + (regexp-opt (symbol-value 'password-word-equivalents)) + "password\\|passphrase")) "Regexp matching password-like prompts. The regexp should match at end of buffer. @@ -3352,7 +3355,8 @@ (defun tramp-action-password (proc vec) "Query the user for a password." (with-current-buffer (process-buffer proc) - (let ((enable-recursive-minibuffers t)) + (let ((enable-recursive-minibuffers t) + (case-fold-search t)) (tramp-check-for-regexp proc tramp-password-prompt-regexp) (tramp-message vec 3 "Sending %s" (match-string 1)) ;; We don't call `tramp-send-string' in order to hide the @@ -3438,7 +3442,8 @@ (defun tramp-process-one-action (proc vec actions) "Wait for output from the shell and perform one action." - (let (found todo item pattern action) + (let ((case-fold-search t) + found todo item pattern action) (while (not found) ;; Reread output once all actions have been performed. ;; Obviously, the output was not complete. @@ -4039,7 +4044,8 @@ "Read a password from user (compat function). Consults the auth-source package. Invokes `password-read' if available, `read-passwd' else." - (let* ((key (tramp-make-tramp-file-name + (let* ((case-fold-search t) + (key (tramp-make-tramp-file-name tramp-current-method tramp-current-user tramp-current-host "")) (pw-prompt @@ -4259,11 +4265,6 @@ ;; tramp-server-local-variable-alist) to define any such variables ;; that they need to, which would then be let bound as appropriate ;; in tramp functions. (Jason Rumney) -;; * IMHO, it's a drawback that currently Tramp doesn't support -;; Unicode in Dired file names by default. Is it possible to -;; improve Tramp to set LC_ALL to "C" only for commands where Tramp -;; expects English? Or just to set LC_MESSAGES to "C" if Tramp -;; expects only English messages? (Juri Linkov) ;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846) ;; * I was wondering if it would be possible to use tramp even if I'm ;; actually using sshfs. But when I launch a command I would like ------------------------------------------------------------ revno: 116057 author: Chong Yidong committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-01-17 17:45:45 +0100 message: Fix Bug#13124. * simple.el (password-word-equivalents): New defcustom. * comint.el (comint-password-prompt-regexp): Use it. Bump version to 24.4. (comint-watch-for-password-prompt): Let-bind `case-fold-search' to t. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-17 14:58:34 +0000 +++ lisp/ChangeLog 2014-01-17 16:45:45 +0000 @@ -1,3 +1,11 @@ +2014-01-17 Chong Yidong + + * simple.el (password-word-equivalents): New defcustom. + * comint.el (comint-password-prompt-regexp): Use it. Bump version + to 24.4. + (comint-watch-for-password-prompt): Let-bind `case-fold-search' + to t. (Bug#13124) + 2014-01-17 Dmitry Gutov * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. === modified file 'lisp/comint.el' --- lisp/comint.el 2014-01-01 07:43:34 +0000 +++ lisp/comint.el 2014-01-17 16:45:45 +0000 @@ -347,14 +347,12 @@ "Old" "old" "New" "new" "'s" "login" "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad") t) " +\\)" - (regexp-opt - '("password" "Password" "passphrase" "Passphrase" - "pass phrase" "Pass phrase" "Response")) + "\\(?:" (regexp-opt password-word-equivalents) "\\|Response\\)" "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\ -\\(?: for .+\\)?:\\s *\\'") +\\(?: for [^:：៖]+\\)?[:：៖]\\s *\\'") "Regexp matching prompts for passwords in the inferior process. This is used by `comint-watch-for-password-prompt'." - :version "24.1" + :version "24.4" :type 'regexp :group 'comint) @@ -2318,7 +2316,8 @@ `comint-password-prompt-regexp'. This function could be in the list `comint-output-filter-functions'." - (when (string-match comint-password-prompt-regexp string) + (when (let ((case-fold-search t)) + (string-match comint-password-prompt-regexp string)) (when (string-match "^[ \n\r\t\v\f\b\a]+" string) (setq string (replace-match "" t t string))) (send-invisible string))) @@ -3631,8 +3630,8 @@ ;; If we see the prompt, tidy up ;; We'll look for the prompt in the original string, so nobody can ;; clobber it - (and (string-match comint-redirect-finished-regexp - (concat comint-redirect-previous-input-string + (and (string-match comint-redirect-finished-regexp + (concat comint-redirect-previous-input-string input-string)) (progn (and comint-redirect-verbose === modified file 'lisp/simple.el' --- lisp/simple.el 2014-01-17 14:58:34 +0000 +++ lisp/simple.el 2014-01-17 16:45:45 +0000 @@ -2555,6 +2555,64 @@ (setq buffer-undo-list nil) t)) +(defcustom password-word-equivalents + '("password" "passphrase" "pass phrase" + "كلمة السر" ; ar + "গুপ্তশব্দ" ; as + "পাসওয়ার্ড" ; bn_IN + "contrasenya" ; ca + "heslo" ; cs + "adgangskode" ; da + "passwort" ; de + "pasvorto" ; eo + "contraseña" ; es + "pasahitza" ; eu + "salasana" ; fi + "mot de passe" ; fr + "પાસવર્ડ" ; gu + "ססמה" ; he + "शब्दकूट" ; hi + "lozinka" ; hr + "Jelszó: " ; hu + "パスワード" ; ja + "Пароль" ; kk + "ಗುಪ್ತಪದ" ; kn + "암호" ; ko + "ពាក្យសម្ងាត់" ; km + "slaptažodis" ; lt + "അടയാളവാക്ക്" ; ml + "गुप्तशब्द" ; mr + "passord" ; nb + "wachtwoord" ; nl + "ପ୍ରବେଶ ସଙ୍କେତ" ; or + "ਪਾਸਵਰਡ" ; pa + "hasło" ; pl + "senha" ; pt + "Пароль" ; ru + "රහස්පදය" ; si + "Heslo" ; sk + "geslo" ; sl + "lozinka" ; sr + "Лозинка" ; sr + "lösenord" ; sv + "கடவுச்சொல்" ; ta + "సంకేతపదము" ; te + "parola" ; tr + "Пароль" ; uk + "Mật khẩu" ; vi + "密码" ; zh_CN + "密碼" ; zh_TW + "iphasiwedi" ; zu + ) + "List of words equivalent to \"password\". +This is used by Shell mode and other parts of Emacs to recognize +password prompts, including prompts in languages other than +English. Different case choices should not be assumed to be +included; callers should bind `case-fold-search' to t." + :type '(repeat string) + :version "24.4" + :group 'processes) + (defvar shell-command-history nil "History list for some commands that read shell commands. ------------------------------------------------------------ revno: 116056 committer: Bastien Guerry branch nick: trunk timestamp: Fri 2014-01-17 15:58:34 +0100 message: Revert revno 116055. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-17 13:05:09 +0000 +++ lisp/ChangeLog 2014-01-17 14:58:34 +0000 @@ -1,8 +1,3 @@ -2014-01-17 Bastien Guerry - - * simple.el (define-alternatives): Fix docstring by advising - developers to (defvar COMMAND-alternatives). - 2014-01-17 Dmitry Gutov * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. === modified file 'lisp/simple.el' --- lisp/simple.el 2014-01-17 13:05:09 +0000 +++ lisp/simple.el 2014-01-17 14:58:34 +0000 @@ -7666,10 +7666,8 @@ and overwrites the previous choice. The variable `COMMAND-alternatives' contains an alist with -alternative implementations of COMMAND. Developers should -use (defvar COMMAND-alternatives) to declare this variable -after they write (define-alternatives COMMAND), otherwise -the variable will not be handled by programs like etags. +alternative implementations of COMMAND. `define-alternatives' +does not have any effect until this variable is set. CUSTOMIZATIONS, if non-nil, should be composed of alternating `defcustom' keywords and values to add to the declaration of ------------------------------------------------------------ revno: 116055 committer: Bastien Guerry branch nick: trunk timestamp: Fri 2014-01-17 14:05:09 +0100 message: * simple.el (define-alternatives): Fix docstring by advising developers to (defvar COMMAND-alternatives). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-17 03:15:02 +0000 +++ lisp/ChangeLog 2014-01-17 13:05:09 +0000 @@ -1,3 +1,8 @@ +2014-01-17 Bastien Guerry + + * simple.el (define-alternatives): Fix docstring by advising + developers to (defvar COMMAND-alternatives). + 2014-01-17 Dmitry Gutov * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. === modified file 'lisp/simple.el' --- lisp/simple.el 2014-01-14 22:30:42 +0000 +++ lisp/simple.el 2014-01-17 13:05:09 +0000 @@ -7666,8 +7666,10 @@ and overwrites the previous choice. The variable `COMMAND-alternatives' contains an alist with -alternative implementations of COMMAND. `define-alternatives' -does not have any effect until this variable is set. +alternative implementations of COMMAND. Developers should +use (defvar COMMAND-alternatives) to declare this variable +after they write (define-alternatives COMMAND), otherwise +the variable will not be handled by programs like etags. CUSTOMIZATIONS, if non-nil, should be composed of alternating `defcustom' keywords and values to add to the declaration of ------------------------------------------------------------ revno: 116054 committer: Bastien Guerry branch nick: trunk timestamp: Fri 2014-01-17 13:43:51 +0100 message: * building.texi (Commands of GUD): Fix keybinding for `gud-break'. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-01-16 08:34:43 +0000 +++ doc/emacs/ChangeLog 2014-01-17 12:43:51 +0000 @@ -1,3 +1,7 @@ +2014-01-17 Bastien Guerry + + * building.texi (Commands of GUD): Fix keybinding for `gud-break'. + 2014-01-15 Glenn Morris * files.texi (File Conveniences): === modified file 'doc/emacs/building.texi' --- doc/emacs/building.texi 2014-01-09 19:11:39 +0000 +++ doc/emacs/building.texi 2014-01-17 12:43:51 +0000 @@ -618,12 +618,12 @@ selecting stack frames, and stepping through the program. @table @kbd -@item C-x @key{SPC} -@kindex C-x SPC +@item C-x C-a C-b +@kindex C-x C-a C-b Set a breakpoint on the source line that point is on. @end table - @kbd{C-x @key{SPC}} (@code{gud-break}), when called in a source + @kbd{C-x C-a C-b} (@code{gud-break}), when called in a source buffer, sets a debugger breakpoint on the current source line. This command is available only after starting GUD@. If you call it in a buffer that is not associated with any debugger subprocess, it signals ------------------------------------------------------------ revno: 116053 fixes bug: http://debbugs.gnu.org/16479 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2014-01-17 13:55:00 +0200 message: Provisional fix for bug #16479 with client connecting while in a TTY menu. src/menu.c (Fx_popup_menu): When invoking tty_menu_show, temporarily switch to single keyboard. Prevents daemon crashes when a new client connects while we show a TTY menu in an existing client. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-15 17:56:40 +0000 +++ src/ChangeLog 2014-01-17 11:55:00 +0000 @@ -1,3 +1,10 @@ +2014-01-17 Eli Zaretskii + + * menu.c (Fx_popup_menu): When invoking tty_menu_show, temporarily + switch to single keyboard. Prevents daemon crashes when a new + client connects while we show a TTY menu in an existing client. + (Bug#16479) + 2014-01-14 Paul Eggert Fix MinGW64 porting problem with _setjmp. === modified file 'src/menu.c' --- src/menu.c 2014-01-01 07:43:34 +0000 +++ src/menu.c 2014-01-17 11:55:00 +0000 @@ -1443,8 +1443,16 @@ else #endif if (FRAME_TERMCAP_P (f)) - selection = tty_menu_show (f, xpos, ypos, for_click, keymaps, title, - kbd_menu_navigation, &error_name); + { + ptrdiff_t count1 = SPECPDL_INDEX (); + + /* Avoid crashes if, e.g., another client will connect while we + are in a menu. */ + temporarily_switch_to_single_kboard (f); + selection = tty_menu_show (f, xpos, ypos, for_click, keymaps, title, + kbd_menu_navigation, &error_name); + unbind_to (count1, Qnil); + } #ifdef HAVE_NS unbind_to (specpdl_count, Qnil); ------------------------------------------------------------ revno: 116052 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-01-17 12:50:15 +0100 message: Fix Bug#13662. * automated/inotify-test.el (inotify-file-watch-simple): Skip test case if inotify is not linked with Emacs. Use `read-event' rather than `sit-for' in order to process events. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-01-13 22:21:32 +0000 +++ test/ChangeLog 2014-01-17 11:50:15 +0000 @@ -1,3 +1,9 @@ +2014-01-17 Michael Albinus + + * automated/inotify-test.el (inotify-file-watch-simple): Skip test + case if inotify is not linked with Emacs. Use `read-event' rather + than `sit-for' in order to process events. (Bug#13662) + 2014-01-13 Michael Albinus * automated/ert-tests.el (ert-test-record-backtrace): Reenable === modified file 'test/automated/inotify-test.el' --- test/automated/inotify-test.el 2014-01-01 07:43:34 +0000 +++ test/automated/inotify-test.el 2014-01-17 11:50:15 +0000 @@ -28,37 +28,36 @@ (declare-function inotify-add-watch "inotify.c" (file-name aspect callback)) (declare-function inotify-rm-watch "inotify.c" (watch-descriptor)) -(when (featurep 'inotify) - - ;; (ert-deftest filewatch-file-watch-aspects-check () - ;; "Test whether `file-watch' properly checks the aspects." - ;; (let ((temp-file (make-temp-file "filewatch-aspects"))) - ;; (should (stringp temp-file)) - ;; (should-error (file-watch temp-file 'wrong nil) - ;; :type 'error) - ;; (should-error (file-watch temp-file '(modify t) nil) - ;; :type 'error) - ;; (should-error (file-watch temp-file '(modify all-modify) nil) - ;; :type 'error) - ;; (should-error (file-watch temp-file '(access wrong modify) nil) - ;; :type 'error))) - - (ert-deftest inotify-file-watch-simple () - "Test if watching a normal file works." - (let ((temp-file (make-temp-file "inotify-simple")) - (events 0)) - (let ((wd - (inotify-add-watch temp-file t (lambda (_ev) - (setq events (1+ events)))))) - (unwind-protect - (progn - (with-temp-file temp-file - (insert "Foo\n")) - (sit-for 5) ;; Hacky. Wait for 5s until events are processed - (should (> events 0))) - (inotify-rm-watch wd) - (delete-file temp-file))))) -) +;; (ert-deftest filewatch-file-watch-aspects-check () +;; "Test whether `file-watch' properly checks the aspects." +;; (let ((temp-file (make-temp-file "filewatch-aspects"))) +;; (should (stringp temp-file)) +;; (should-error (file-watch temp-file 'wrong nil) +;; :type 'error) +;; (should-error (file-watch temp-file '(modify t) nil) +;; :type 'error) +;; (should-error (file-watch temp-file '(modify all-modify) nil) +;; :type 'error) +;; (should-error (file-watch temp-file '(access wrong modify) nil) +;; :type 'error))) + +(ert-deftest inotify-file-watch-simple () + "Test if watching a normal file works." + + (skip-unless (featurep 'inotify)) + (let ((temp-file (make-temp-file "inotify-simple")) + (events 0)) + (let ((wd + (inotify-add-watch temp-file t (lambda (_ev) + (setq events (1+ events)))))) + (unwind-protect + (progn + (with-temp-file temp-file + (insert "Foo\n")) + (read-event nil nil 5) + (should (> events 0))) + (inotify-rm-watch wd) + (delete-file temp-file))))) (provide 'inotify-tests) ------------------------------------------------------------ revno: 116051 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-16 22:22:55 -0500 message: * lisp/menu-bar.el: Fix author header comment (accidentally omitted from previous commit) diff: === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2014-01-07 16:50:03 +0000 +++ lisp/menu-bar.el 2014-01-17 03:22:55 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 1993-1995, 2000-2014 Free Software Foundation, Inc. -;; Author: RMS +;; Author: Richard M. Stallman ;; Maintainer: FSF ;; Keywords: internal, mouse ;; Package: emacs