------------------------------------------------------------ revno: 117666 committer: Kelvin White branch nick: trunk timestamp: Thu 2014-08-07 12:44:19 -0400 message: * lisp/erc/erc.el: rename server buffers and fix variable names diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2014-07-08 19:45:24 +0000 +++ lisp/erc/ChangeLog 2014-08-07 16:44:19 +0000 @@ -1,8 +1,14 @@ +2014-08-07 Kelvin White + + * erc.el (erc-channel-receive-names): Fix variable names + (erc-format-target-and/or-network): Rename server-buffers to + network name if possible + 2014-07-08 Stefan Monnier * erc.el (erc-channel-receive-names): Reduce redundancy. -2014-06-19 Kelvin White +2014-06-19 Kelvin White * erc-backend.el: Handle user modes in relevant server responses * erc.el: Better user mode support. === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2014-07-08 19:45:24 +0000 +++ lisp/erc/erc.el 2014-08-07 16:44:19 +0000 @@ -4783,10 +4783,10 @@ (setq name (substring item 1)) (setf (pcase (aref item 0) ((pred (eq voice-ch)) voice) - ((pred (eq hop-ch)) hop) + ((pred (eq hop-ch)) halfop) ((pred (eq op-ch)) op) - ((pred (eq adm-ch)) adm) - ((pred (eq own-ch)) own)) + ((pred (eq adm-ch)) admin) + ((pred (eq own-ch)) owner)) 'on))) (when updatep (puthash (erc-downcase name) t @@ -6233,7 +6233,10 @@ (cond ((erc-default-target) (concat (erc-string-no-properties (erc-default-target)) "@" network-name)) - (network-name network-name) + ((and network-name + (not (string-equal network-name (buffer-name)))) + (rename-buffer network-name) + network-name) (t (buffer-name (current-buffer)))))) (defun erc-format-away-status () ------------------------------------------------------------ revno: 117665 committer: martin rudalics branch nick: trunk timestamp: Thu 2014-08-07 16:34:06 +0200 message: In window--min-size-1 set WINDOW arg when calling window-min-pixel-height/-width. * window.el (window--min-size-1): Explicitly set WINDOW arg in calls of window-min-pixel-height and window-min-pixel-width. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-07 11:49:36 +0000 +++ lisp/ChangeLog 2014-08-07 14:34:06 +0000 @@ -1,3 +1,8 @@ +2014-08-07 Martin Rudalics + + * window.el (window--min-size-1): Explicitly set WINDOW arg in + calls of window-min-pixel-height and window-min-pixel-width. + 2014-08-07 Reuben Thomas * progmodes/ada-mode.el: === modified file 'lisp/window.el' --- lisp/window.el 2014-07-29 15:08:30 +0000 +++ lisp/window.el 2014-08-07 14:34:06 +0000 @@ -1297,7 +1297,7 @@ (* (ceiling pixel-width char-size) char-size)) (if (window--size-ignore-p window ignore) 0 - (window-min-pixel-width))) + (window-min-pixel-width window))) (max (ceiling pixel-width char-size) (if (window--size-ignore-p window ignore) @@ -1318,7 +1318,7 @@ (* (ceiling pixel-height char-size) char-size)) (if (window--size-ignore-p window ignore) 0 - (window-min-pixel-height))) + (window-min-pixel-height window))) (max (ceiling pixel-height char-size) (if (window--size-ignore-p window ignore) 0 ------------------------------------------------------------ revno: 117664 fixes bug: http://debbugs.gnu.org/17691 committer: Paul Eggert branch nick: trunk timestamp: Thu 2014-08-07 07:17:03 -0700 message: * xterm.c (x_delete_terminal): Plug file descriptor leak. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-07 10:15:52 +0000 +++ src/ChangeLog 2014-08-07 14:17:03 +0000 @@ -1,3 +1,7 @@ +2014-08-07 Paul Eggert + + * xterm.c (x_delete_terminal): Plug file descriptor leak (Bug#17691). + 2014-08-07 Reuben Thomas Refer to MS-DOS using the same name everywhere. === modified file 'src/xterm.c' --- src/xterm.c 2014-08-05 08:25:28 +0000 +++ src/xterm.c 2014-08-07 14:17:03 +0000 @@ -11329,7 +11329,10 @@ /* No more input on this descriptor. */ if (0 <= dpyinfo->connection) - delete_keyboard_wait_descriptor (dpyinfo->connection); + { + delete_keyboard_wait_descriptor (dpyinfo->connection); + emacs_close (dpyinfo->connection); + } /* Mark as dead. */ dpyinfo->display = NULL; ------------------------------------------------------------ revno: 117663 committer: Reuben Thomas branch nick: trunk timestamp: Thu 2014-08-07 12:49:36 +0100 message: Remove remaining mentions of VMS as a host * notes/exit-value: Remove specific discussion of VMS. * doc/emacs/programs.texi (Program Modes): Don't advertise VMS DCL support any more. * doc/misc/ediff.texi (Merging and diff3): Don't mention lack of support for VMS diff, we no longer support VMS. * lisp/progmodes/ada-mode.el: * lisp/net/tramp.el (tramp-handle-file-symlink-p): * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment about VMS, which we no longer support. * lisp/progmodes/ada-xref.el (ada-xref-current): Remove mention of VMS, and fix a FIXME, using convert-standard-filename in place of removed ada-convert-file-name. * lisp/url/url-handlers.el: Remove a comment about VMS, which we no longer support. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-08-07 09:55:09 +0000 +++ admin/ChangeLog 2014-08-07 11:49:36 +0000 @@ -1,5 +1,9 @@ 2014-08-07 Reuben Thomas + * notes/exit-value: Remove specific discussion of VMS. + +2014-08-07 Reuben Thomas + Refer to MS-DOS using the same name everywhere. * FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become === modified file 'admin/notes/exit-value' --- admin/notes/exit-value 2011-05-10 13:57:12 +0000 +++ admin/notes/exit-value 2014-08-07 11:49:36 +0000 @@ -1,35 +1,28 @@ ttn 2004-05-09 -The exit value of a program returning to the shell on unixoid systems is -typically 0 for success, and non-0 (such as 1) for failure. For vms it is -odd (1,3,5...) for success, even (0,2,4...) for failure. - -This holds from the point of view of the "shell" (in quotes because vms has a -different dispatch model that is not explained further here). - -From the point of view of the program, nowadays stdlib.h on both type of -systems provides macros `EXIT_SUCCESS' and `EXIT_FAILURE' that should DTRT. - -NB: The numerical values of these macros DO NOT need to fulfill the exit -value requirements outlined in the first paragraph! That is the job of the +The exit value of a program returning to the shell on unixoid systems +is typically 0 for success, and non-0 (such as 1) for failure. This is +not always the case on other systems. + +From the point of view of the program stdlib.h provides macros +`EXIT_SUCCESS' and `EXIT_FAILURE' that should DTRT. N.B. The +numerical values of these macros DO NOT need to fulfill the exit value +requirements outlined in the first paragraph! That is the job of the `exit' function. Thus, this kind of construct shows misunderstanding: - #ifdef VMS + #ifdef WEIRD_OS exit (1); #else exit (0); #endif -Values aside from EXIT_SUCCESS and EXIT_FAILURE are tricky. - - - -ttn 2004-05-12 - -Values aside from EXIT_SUCCESS and EXIT_FAILURE can be used to indicate -finer gradations of failure. If this is the only information available -to the caller, clamping such values to EXIT_FAILURE loses information. -If there are other ways to indicate the problem to the caller (such as -a message to stderr) it may be ok to clamp. In all cases, it is the -relationship between the program and its caller that must be examined. -[Insert ZAMM quote here.] +Values aside from EXIT_SUCCESS and EXIT_FAILURE are tricky, but can be +used to indicate finer gradations of failure. If this is the only +information available to the caller, clamping such values to +EXIT_FAILURE loses information. If there are other ways to indicate +the problem to the caller (such as a message to stderr) it may be ok +to clamp. In all cases, it is the relationship between the program +and its caller that must be examined. + +[Insert ZAMM quote here.] <-- I presume this refers to ``Zen and the +Art of Motorcycle Maintenance'' - Reuben Thomas . === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-08-07 09:55:09 +0000 +++ doc/emacs/ChangeLog 2014-08-07 11:49:36 +0000 @@ -1,5 +1,10 @@ 2014-08-07 Reuben Thomas + * programs.texi (Program Modes): Don't advertise VMS DCL support + any more. + +2014-08-07 Reuben Thomas + Refer to MS-DOS using the same name everywhere. * Makefile.in (EMACSSOURCES): ``MS-DOG'', ``MSDOG'' and ``msdog'' === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2014-06-07 23:39:40 +0000 +++ doc/emacs/programs.texi 2014-08-07 11:49:36 +0000 @@ -88,8 +88,8 @@ Octave, Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl, and VHDL@. An alternative mode for Perl is called CPerl mode. Modes are also available for the scripting languages of the common GNU and Unix -shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files, and for -makefiles, DNS master files, and various sorts of configuration files. +shells, and MS-DOS/MS-Windows @samp{BAT} files, and for makefiles, +DNS master files, and various sorts of configuration files. Ideally, Emacs should have a major mode for each programming language that you might want to edit. If it doesn't have a mode for === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-08-07 09:15:44 +0000 +++ doc/misc/ChangeLog 2014-08-07 11:49:36 +0000 @@ -1,3 +1,8 @@ +2014-08-07 Reuben Thomas + + * ediff.texi (Merging and diff3): Don't mention lack of support + for VMS diff, we no longer support VMS. + 2014-08-07 Michael Albinus * tramp.texi (Remote shell setup): Explain, how to change command === modified file 'doc/misc/ediff.texi' --- doc/misc/ediff.texi 2014-06-10 02:20:31 +0000 +++ doc/misc/ediff.texi 2014-08-07 11:49:36 +0000 @@ -350,8 +350,7 @@ to find differences between two files. They process the @code{diff} output and display it in a convenient form. At present, Ediff understands only the plain output from diff. Options such as @samp{-c} are not supported, -nor is the format produced by incompatible file comparison programs such as -the VMS version of @code{diff}. +nor is the format produced by incompatible file comparison programs. The functions @code{ediff-files}, @code{ediff-buffers}, @code{ediff-files3}, @code{ediff-buffers3} first display the coarse, @@ -1945,11 +1944,6 @@ @end table -@noindent -@strong{Warning:} Ediff does not support the output format of VMS -@code{diff}. Instead, make sure you are using some implementation of POSIX -@code{diff}, such as @code{gnudiff}. - @node Merging and diff3 @section Merging and diff3 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-07 10:15:52 +0000 +++ lisp/ChangeLog 2014-08-07 11:49:36 +0000 @@ -1,5 +1,20 @@ 2014-08-07 Reuben Thomas + * progmodes/ada-mode.el: + * net/tramp.el (tramp-handle-file-symlink-p): + * net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment + about VMS, which we no longer support. + * progmodes/ada-xref.el (ada-xref-current): Remove mention of VMS, + and fix a FIXME, using convert-standard-filename in place of + removed ada-convert-file-name. + +2014-08-07 Eli Zaretskii + + * files.el (auto-mode-alist): Remove support for VMS from a + pattern. + +2014-08-07 Reuben Thomas + Refer to MS-DOS using the same name everywhere. * arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous === modified file 'lisp/files.el' --- lisp/files.el 2014-08-07 10:15:52 +0000 +++ lisp/files.el 2014-08-07 11:49:36 +0000 @@ -2413,7 +2413,7 @@ ("\\.wy\\'" . wisent-grammar-mode) ;; .emacs or .gnus or .viper following a directory delimiter in ;; Unix or MS-DOS syntax. - ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) + ("[:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) ("\\`\\..*emacs\\'" . emacs-lisp-mode) ;; _emacs following a directory delimiter in MS-DOS syntax ("[:/]_emacs\\'" . emacs-lisp-mode) === modified file 'lisp/net/tramp-ftp.el' --- lisp/net/tramp-ftp.el 2014-06-15 15:47:35 +0000 +++ lisp/net/tramp-ftp.el 2014-08-07 11:49:36 +0000 @@ -178,12 +178,7 @@ (ignore-errors (delete-file tmpfile))))) ;; Normally, the handlers must be discarded. - ;; `inhibit-file-name-handlers' isn't sufficient, because the - ;; local file name could be in Tramp syntax as well (for - ;; example, returning VMS file names like "/DISK$CAM:/AAA"). - ;; That's why we set also `tramp-mode' to nil. - (t (let* (;(tramp-mode nil) - (inhibit-file-name-handlers + (t (let* ((inhibit-file-name-handlers (list 'tramp-file-name-handler 'tramp-completion-file-name-handler (and (eq inhibit-file-name-operation operation) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2014-07-03 09:27:02 +0000 +++ lisp/net/tramp.el 2014-08-07 11:49:36 +0000 @@ -2998,8 +2998,6 @@ (with-parsed-tramp-file-name filename nil (let ((x (car (file-attributes filename)))) (when (stringp x) - ;; When Tramp is running on VMS, then `file-name-absolute-p' - ;; might do weird things. (if (file-name-absolute-p x) (tramp-make-tramp-file-name method user host x) x))))) === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2014-01-25 19:15:42 +0000 +++ lisp/progmodes/ada-mode.el 2014-08-07 11:49:36 +0000 @@ -31,11 +31,6 @@ ;; independent from the GNU Ada compiler GNAT, distributed by Ada ;; Core Technologies. All the other files rely heavily on features ;; provided only by GNAT. -;; -;; Note: this mode will not work with Emacs 19. If you are on a VMS -;; system, where the latest version of Emacs is 19.28, you will need -;; another file, called ada-vms.el, that provides some required -;; functions. ;;; Usage: ;; Emacs should enter Ada mode automatically when you load an Ada file. === modified file 'lisp/progmodes/ada-xref.el' --- lisp/progmodes/ada-xref.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/ada-xref.el 2014-08-07 11:49:36 +0000 @@ -651,12 +651,6 @@ (find-file (car (cdr pos))) (goto-char (car pos))))) -(defun ada-convert-file-name (name) - "Convert from NAME to a name that can be used by the compilation commands. -This is overridden on VMS to convert from VMS filenames to Unix filenames." - name) -;; FIXME: use convert-standard-filename instead - (defun ada-set-default-project-file (file) "Set FILE as the current project file." (interactive "fProject file:") @@ -1465,7 +1459,7 @@ (get-file-buffer ali-file-name)) (kill-buffer (get-file-buffer ali-file-name))) - (let* ((name (ada-convert-file-name file)) + (let* ((name (convert-standard-filename file)) (body-name (or (ada-get-body-name name) name))) ;; Always recompile the body when we can. We thus temporarily switch to a === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2014-08-03 15:38:52 +0000 +++ lisp/url/ChangeLog 2014-08-07 11:49:36 +0000 @@ -1,3 +1,8 @@ +2014-08-07 Reuben Thomas + + * url-handlers.el: Remove a comment about VMS, which we no longer + support. + 2014-08-03 Paul Eggert Don't mishandle dates in the year 9999 (Bug#18176). === modified file 'lisp/url/url-handlers.el' --- lisp/url/url-handlers.el 2014-06-26 06:55:15 +0000 +++ lisp/url/url-handlers.el 2014-08-07 11:49:36 +0000 @@ -51,7 +51,7 @@ ;; delete-directory Finished (DAV) ;; delete-file Finished (DAV) ;; diff-latest-backup-file -;; directory-file-name unnecessary (what about VMS)? +;; directory-file-name unnecessary ;; directory-files Finished (DAV) ;; dired-call-process ;; dired-compress-file ------------------------------------------------------------ revno: 117662 committer: Reuben Thomas branch nick: trunk timestamp: Thu 2014-08-07 11:15:52 +0100 message: Fix a few ``MS-DOG''s overlooked in the previous commit. * README: ``MSDOG'' becomes ``MS-DOS''. * lisp/arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous commit. * lisp/file-mode.el: ditto. * src/editfns.c: Fix a couple of ``MS-DOG''s missed in the previous commit. * src/xfaces.c: ditto. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-04 18:44:49 +0000 +++ ChangeLog 2014-08-07 10:15:52 +0000 @@ -1,3 +1,7 @@ +2014-08-07 Reuben Thomas + + * README: ``MSDOG'' becomes ``MS-DOS''. + 2014-08-04 Paul Eggert Merge from gnulib, incorporating: === modified file 'README' --- README 2014-06-26 06:55:15 +0000 +++ README 2014-08-07 10:15:52 +0000 @@ -84,7 +84,7 @@ `doc/lispref' holds the source code for the Emacs Lisp reference manual. `doc/lispintro' holds the source code for the Introduction to Programming in Emacs Lisp manual. -`msdos' holds configuration files for compiling Emacs under MSDOG. +`msdos' holds configuration files for compiling Emacs under MS-DOS. `nextstep' holds instructions and some other files for compiling the Nextstep port of Emacs, for GNUstep and Mac OS X Cocoa. `nt' holds various command files and documentation files that pertain === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-07 09:55:09 +0000 +++ lisp/ChangeLog 2014-08-07 10:15:52 +0000 @@ -2,6 +2,14 @@ Refer to MS-DOS using the same name everywhere. + * arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous + commit. + * file-mode.el: ditto. + +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become ``MS-DOS''. * frame.el: ditto. === modified file 'lisp/arc-mode.el' --- lisp/arc-mode.el 2014-08-07 09:55:09 +0000 +++ lisp/arc-mode.el 2014-08-07 10:15:52 +0000 @@ -31,7 +31,7 @@ ;; understand the directory level of the archives. For this reason, ;; you should expect this code to need more fiddling than tar-mode.el ;; (although it at present has fewer bugs :-) In particular, I have -;; not tested this under Ms-Dog myself. +;; not tested this under MS-DOS myself. ;; ------------------------------------- ;; INTERACTION: arc-mode.el should play together with ;; === modified file 'lisp/files.el' --- lisp/files.el 2014-07-28 09:39:09 +0000 +++ lisp/files.el 2014-08-07 10:15:52 +0000 @@ -2412,11 +2412,10 @@ ("\\.by\\'" . bovine-grammar-mode) ("\\.wy\\'" . wisent-grammar-mode) ;; .emacs or .gnus or .viper following a directory delimiter in - ;; Unix, MSDOG or VMS syntax. + ;; Unix or MS-DOS syntax. ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) ("\\`\\..*emacs\\'" . emacs-lisp-mode) - ;; _emacs following a directory delimiter - ;; in MsDos syntax + ;; _emacs following a directory delimiter in MS-DOS syntax ("[:/]_emacs\\'" . emacs-lisp-mode) ("/crontab\\.X*[0-9]+\\'" . shell-script-mode) ("\\.ml\\'" . lisp-mode) @@ -2439,7 +2438,7 @@ ("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode) ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode) ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode) - ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MSDOG + ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS ("\\.[eE]?[pP][sS]\\'" . ps-mode) ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|djvu\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe) ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-05 08:25:28 +0000 +++ src/ChangeLog 2014-08-07 10:15:52 +0000 @@ -1,3 +1,11 @@ +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * editfns.c: Fix a couple of ``MS-DOG''s missed in the previous + commit. + * xfaces.c: ditto. + 2014-08-05 Martin Rudalics * w32term.c (w32_redeem_scroll_bar): === modified file 'src/editfns.c' --- src/editfns.c 2014-08-03 15:38:52 +0000 +++ src/editfns.c 2014-08-07 10:15:52 +0000 @@ -112,7 +112,7 @@ pw = getpwuid (getuid ()); #ifdef MSDOS /* We let the real user name default to "root" because that's quite - accurate on MSDOG and because it lets Emacs find the init file. + accurate on MS-DOS and because it lets Emacs find the init file. (The DVX libraries override the Djgpp libraries here.) */ Vuser_real_login_name = build_string (pw ? pw->pw_name : "root"); #else === modified file 'src/xfaces.c' --- src/xfaces.c 2014-07-19 15:18:23 +0000 +++ src/xfaces.c 2014-08-07 10:15:52 +0000 @@ -1068,7 +1068,7 @@ return XCAR (coldesc); } #ifdef MSDOS - /* We can have an MSDOG frame under -nw for a short window of + /* We can have an MS-DOS frame under -nw for a short window of opportunity before internal_terminal_init is called. DTRT. */ if (FRAME_MSDOS_P (f) && !inhibit_window_system) return msdos_stdcolor_name (idx); ------------------------------------------------------------ revno: 117661 committer: Reuben Thomas branch nick: trunk timestamp: Thu 2014-08-07 10:55:09 +0100 message: Refer to MS-DOS using the same name everywhere. * admin/FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become ``MS-DOS''; ``msdog'' in filenames becomes ``msdos''. * admin/MAINTAINERS: ditto. * doc/emacs/Makefile.in (EMACSSOURCES): ditto. * doc/emacs/emacs-xtra.texi: ditto. * doc/emacs/emacs.texi: ditto. * doc/emacs/makefile.w32-in: ditto. * doc/emacs/msdog-xtra.texi: ditto, and rename file. * doc/emacs/msdog.texi: ditto, and rename file. * lisp/arc-mode.el: ditto. * lisp/frame.el: ditto. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-07-14 19:23:18 +0000 +++ admin/ChangeLog 2014-08-07 09:55:09 +0000 @@ -1,3 +1,11 @@ +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become + ``MS-DOS''. + * MAINTAINERS: ditto. + 2014-07-14 Paul Eggert Use binary-io module, O_BINARY, and "b" flag (Bug#18006). === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2014-06-06 06:49:17 +0000 +++ admin/FOR-RELEASE 2014-08-07 09:55:09 +0000 @@ -202,8 +202,8 @@ mini.texi misc.texi modes.texi -msdog.texi -msdog-xtra.texi +msdos.texi +msdos-xtra.texi mule.texi m-x.texi package.texi === modified file 'admin/MAINTAINERS' --- admin/MAINTAINERS 2013-01-09 04:00:57 +0000 +++ admin/MAINTAINERS 2014-08-07 09:55:09 +0000 @@ -36,7 +36,7 @@ lisp/dos-fns.el lisp/dos-w32.el lisp/dos-vars.el - doc/emacs/msdog.texi + doc/emacs/msdos.texi Kenichi Handa Mule === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-07-21 06:03:08 +0000 +++ doc/emacs/ChangeLog 2014-08-07 09:55:09 +0000 @@ -1,3 +1,15 @@ +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * Makefile.in (EMACSSOURCES): ``MS-DOG'', ``MSDOG'' and ``msdog'' + become ``MS-DOS''; ``msdog'' in filenames becomes ``msdos''. + * emacs-xtra.texi: ditto. + * emacs.texi: ditto. + * makefile.w32-in: ditto. + * msdog-xtra.texi: ditto, and rename file. + * msdog.texi: ditto, and rename file. + 2014-07-21 Glenn Morris * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug. (Bug#18040) === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2014-06-23 06:43:20 +0000 +++ doc/emacs/Makefile.in 2014-08-07 09:55:09 +0000 @@ -91,7 +91,7 @@ $(srcdir)/vc-xtra.texi \ $(srcdir)/vc1-xtra.texi \ $(srcdir)/fortran-xtra.texi \ - $(srcdir)/msdog-xtra.texi + $(srcdir)/msdos-xtra.texi EMACSSOURCES= \ ${srcdir}/emacs.texi \ @@ -135,7 +135,7 @@ ${srcdir}/xresources.texi \ ${srcdir}/anti.texi \ ${srcdir}/macos.texi \ - ${srcdir}/msdog.texi \ + ${srcdir}/msdos.texi \ ${srcdir}/gnu.texi \ ${srcdir}/glossary.texi \ ${srcdir}/ack.texi \ === modified file 'doc/emacs/emacs-xtra.texi' --- doc/emacs/emacs-xtra.texi 2014-06-10 02:20:31 +0000 +++ doc/emacs/emacs-xtra.texi 2014-08-07 09:55:09 +0000 @@ -120,7 +120,7 @@ @include fortran-xtra.texi -@include msdog-xtra.texi +@include msdos-xtra.texi @lowersections @end iftex === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2014-07-21 06:03:08 +0000 +++ doc/emacs/emacs.texi 2014-08-07 09:55:09 +0000 @@ -1574,8 +1574,8 @@ @include anti.texi @include macos.texi -@c Includes msdog-xtra. -@include msdog.texi +@c Includes msdos-xtra. +@include msdos.texi @include gnu.texi @include glossary.texi @ifnottex === modified file 'doc/emacs/makefile.w32-in' --- doc/emacs/makefile.w32-in 2014-01-01 07:43:34 +0000 +++ doc/emacs/makefile.w32-in 2014-08-07 09:55:09 +0000 @@ -54,7 +54,7 @@ $(srcdir)/vc-xtra.texi \ $(srcdir)/vc1-xtra.texi \ $(srcdir)/fortran-xtra.texi \ - $(srcdir)/msdog-xtra.texi + $(srcdir)/msdos-xtra.texi EMACSSOURCES= \ $(srcdir)/emacs.texi \ @@ -97,7 +97,7 @@ $(srcdir)/xresources.texi \ $(srcdir)/anti.texi \ $(srcdir)/macos.texi \ - $(srcdir)/msdog.texi \ + $(srcdir)/msdos.texi \ $(srcdir)/gnu.texi \ $(srcdir)/glossary.texi \ $(srcdir)/ack.texi \ === renamed file 'doc/emacs/msdog-xtra.texi' => 'doc/emacs/msdos-xtra.texi' --- doc/emacs/msdog-xtra.texi 2014-04-29 14:45:24 +0000 +++ doc/emacs/msdos-xtra.texi 2014-08-07 09:55:09 +0000 @@ -6,19 +6,18 @@ @c printed version) or in the main Emacs manual (for the on-line version). @node MS-DOS @section Emacs and MS-DOS -@cindex MS-DOG @cindex MS-DOS peculiarities This section briefly describes the peculiarities of using Emacs on -the MS-DOS ``operating system'' (also known as ``MS-DOG''). +the MS-DOS ``operating system''. @iftex Information about Emacs and Microsoft's current operating system -Windows (also known as ``Losedows'') is in the main Emacs manual +Windows is in the main Emacs manual (@pxref{Microsoft Windows,,, emacs, the Emacs Manual}). @end iftex @ifnottex Information about peculiarities common to MS-DOS and Microsoft's -current operating systems Windows (also known as ``Losedows'') is in +current operating systems Windows is in @ref{Microsoft Windows}. @end ifnottex === renamed file 'doc/emacs/msdog.texi' => 'doc/emacs/msdos.texi' --- doc/emacs/msdog.texi 2014-06-08 01:20:35 +0000 +++ doc/emacs/msdos.texi 2014-08-07 09:55:09 +0000 @@ -9,7 +9,7 @@ This section describes peculiarities of using Emacs on Microsoft Windows. Some of these peculiarities are also relevant to Microsoft's -older MS-DOS ``operating system'' (also known as ``MS-DOG''). +older MS-DOS operating system. However, Emacs features that are relevant @emph{only} to MS-DOS are described in a separate @iftex @@ -986,5 +986,5 @@ @end ifnottex @ifnottex -@include msdog-xtra.texi +@include msdos-xtra.texi @end ifnottex === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-07 09:13:54 +0000 +++ lisp/ChangeLog 2014-08-07 09:55:09 +0000 @@ -1,3 +1,11 @@ +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become + ``MS-DOS''. + * frame.el: ditto. + 2014-08-07 Michael Albinus * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): === modified file 'lisp/arc-mode.el' --- lisp/arc-mode.el 2014-01-16 06:24:06 +0000 +++ lisp/arc-mode.el 2014-08-07 09:55:09 +0000 @@ -4,7 +4,7 @@ ;; Inc. ;; Author: Morten Welinder -;; Keywords: files archives msdog editing major-mode +;; Keywords: files archives ms-dos editing major-mode ;; Favorite-brand-of-beer: None, I hate beer. ;; This file is part of GNU Emacs. === modified file 'lisp/frame.el' --- lisp/frame.el 2014-07-27 13:21:30 +0000 +++ lisp/frame.el 2014-08-07 09:55:09 +0000 @@ -1344,8 +1344,8 @@ (let ((frame-type (framep-on-display display))) (cond ((eq frame-type 'pc) - ;; MS-DOG frames support selections when Emacs runs inside - ;; the Windows' DOS Box. + ;; MS-DOS frames support selections when Emacs runs inside + ;; a Windows DOS Box. (with-no-warnings (not (null dos-windows-version)))) ((memq frame-type '(x w32 ns)) ------------------------------------------------------------ revno: 117660 committer: Michael Albinus branch nick: trunk timestamp: Thu 2014-08-07 11:15:44 +0200 message: * tramp.texi (Remote shell setup): Explain, how to change command line arguments of remote "nc" listener. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-08-01 00:10:16 +0000 +++ doc/misc/ChangeLog 2014-08-07 09:15:44 +0000 @@ -1,3 +1,8 @@ +2014-08-07 Michael Albinus + + * tramp.texi (Remote shell setup): Explain, how to change command + line arguments of remote "nc" listener. + 2014-07-31 Tassilo Horn * gnus.texi (Group Parameters): Document that `gcc-self' may also be a === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2014-06-15 15:09:22 +0000 +++ doc/misc/tramp.texi 2014-08-07 09:15:44 +0000 @@ -2062,6 +2062,32 @@ @end ifset @end ifinfo +@item @command{busybox} / @command{nc} +@cindex Unix command nc +@cindex nc Unix command + +The @command{nc} command will be used with the @option{nc} method. On +the remote host, a listener will be installed. Unfortunately, the +command line syntax for this has been changed with the different +@command{busybox} versions. @value{tramp} uses the following syntax +(see @code{tramp-methods}): + +@example +# nc -l -p 42 +@end example + +If your remote @command{nc} refuses to accept the @command{-p} +parameter, you could overwrite the syntax with the following form: + +@lisp +(add-to-list + 'tramp-connection-properties + `(,(regexp-quote "192.168.0.1") "remote-copy-args" (("-l") ("%r")))) +@end lisp + +@noindent +with @samp{192.168.0.1} being the IP address of your remote host +(@pxref{Predefined connection information}). @end table ------------------------------------------------------------ revno: 117659 committer: Michael Albinus branch nick: trunk timestamp: Thu 2014-08-07 11:13:54 +0200 message: * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use cached "remote-copy-args" value, if available. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-07 03:25:09 +0000 +++ lisp/ChangeLog 2014-08-07 09:13:54 +0000 @@ -1,3 +1,8 @@ +2014-08-07 Michael Albinus + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): + Use cached "remote-copy-args" value, if available. (Bug#18199) + 2014-08-07 Leo Liu * help.el (temp-buffer-setup-hook,temp-buffer-show-hook): Revert === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-07-28 19:08:43 +0000 +++ lisp/net/tramp-sh.el 2014-08-07 09:13:54 +0000 @@ -218,7 +218,9 @@ ;; We use "-v" for better error tracking. (tramp-copy-args (("-w" "1") ("-v") ("%h") ("%r"))) (tramp-remote-copy-program "nc") - ;; We use "-p" as required for busyboxes. + ;; We use "-p" as required for newer busyboxes. For older + ;; busybox/nc versions, the value must be (("-l") ("%r")). This + ;; can be achieved by tweaking `tramp-connection-properties'. (tramp-remote-copy-args (("-l") ("-p" "%r"))) (tramp-default-port 23))) ;;;###tramp-autoload @@ -2334,6 +2336,7 @@ method 'tramp-copy-program) copy-keep-date (tramp-get-method-parameter method 'tramp-copy-keep-date) + copy-args (delete ;; " " has either been a replacement of "%k" (when @@ -2349,6 +2352,7 @@ copy-args (let ((y (mapcar (lambda (z) (format-spec z spec)) x))) (if (member "" y) '(" ") y)))))) + copy-env (delq nil @@ -2357,23 +2361,20 @@ (setq x (mapcar (lambda (y) (format-spec y spec)) x)) (unless (member "" x) (mapconcat 'identity x " "))) (tramp-get-method-parameter method 'tramp-copy-env))) - remote-copy-program (tramp-get-method-parameter - method 'tramp-remote-copy-program) - remote-copy-args - (delete - ;; " " has either been a replacement of "%k" (when - ;; keep-date argument is non-nil), or a replacement - ;; for the whole keep-date sublist. - " " - (dolist - (x - (tramp-get-method-parameter method 'tramp-remote-copy-args) - remote-copy-args) - (setq remote-copy-args - (append - remote-copy-args - (let ((y (mapcar (lambda (z) (format-spec z spec)) x))) - (if (member "" y) '(" ") y))))))) + + remote-copy-program + (tramp-get-method-parameter method 'tramp-remote-copy-program)) + + (dolist + (x + (or + (tramp-get-connection-property v "remote-copy-args" nil) + (tramp-get-method-parameter method 'tramp-remote-copy-args))) + (setq remote-copy-args + (append + remote-copy-args + (let ((y (mapcar (lambda (z) (format-spec z spec)) x))) + (if (member "" y) '(" ") y))))) ;; Check for local copy program. (unless (executable-find copy-program) ------------------------------------------------------------ revno: 117658 committer: Leo Liu branch nick: trunk timestamp: Thu 2014-08-07 11:25:09 +0800 message: * lisp/help.el (temp-buffer-setup-hook,temp-buffer-show-hook): Revert change on 2014-03-22. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-06 18:19:34 +0000 +++ lisp/ChangeLog 2014-08-07 03:25:09 +0000 @@ -1,6 +1,11 @@ +2014-08-07 Leo Liu + + * help.el (temp-buffer-setup-hook,temp-buffer-show-hook): Revert + change on 2014-03-22. + 2014-08-06 Ulf Jasper - * calendar/icalendar.el (icalendar--diarytime-to-isotime): + * calendar/icalendar.el (icalendar--diarytime-to-isotime): (icalendar--convert-ordinary-to-ical): Allow for missing minutes (Bug#13750). === modified file 'lisp/help.el' --- lisp/help.el 2014-07-03 06:00:53 +0000 +++ lisp/help.el 2014-08-07 03:25:09 +0000 @@ -32,6 +32,10 @@ ;; or run interpreted, but not when the compiled code is loaded. (eval-when-compile (require 'help-macro)) +;; This makes `with-output-to-temp-buffer' buffers use `help-mode'. +(add-hook 'temp-buffer-setup-hook 'help-mode-setup) +(add-hook 'temp-buffer-show-hook 'help-mode-finish) + ;; `help-window-point-marker' is a marker you can move to a valid ;; position of the buffer shown in the help window in order to override ;; the standard positioning mechanism (`point-min') chosen by ------------------------------------------------------------ revno: 117657 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-08-06 17:07:32 -0700 message: * test/automated/Makefile.in (check-tar): Remove, hydra recipe does it now. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-08-06 18:19:34 +0000 +++ test/ChangeLog 2014-08-07 00:07:32 +0000 @@ -1,3 +1,7 @@ +2014-08-07 Glenn Morris + + * automated/Makefile.in (check-tar): Remove, hydra recipe does it now. + 2014-08-06 Ulf Jasper * automated/icalendar-tests.el === modified file 'test/automated/Makefile.in' --- test/automated/Makefile.in 2014-08-03 20:34:33 +0000 +++ test/automated/Makefile.in 2014-08-07 00:07:32 +0000 @@ -121,11 +121,6 @@ check-maybe: ${LOGFILES} $(emacs) -l ert -f ert-summarize-tests-batch-and-exit $^ -## Mainly for hydra. -.PHONY: check-tar -check-tar: check - tar -cf logs.tar ${LOGFILES} - .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean clean mostlyclean: ------------------------------------------------------------ revno: 117656 committer: Ulf Jasper branch nick: trunk timestamp: Wed 2014-08-06 20:19:34 +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-08-05 19:01:51 +0000 +++ lisp/ChangeLog 2014-08-06 18:19:34 +0000 @@ -1,3 +1,10 @@ +2014-08-06 Ulf Jasper + + * calendar/icalendar.el (icalendar--diarytime-to-isotime): + (icalendar--convert-ordinary-to-ical): Allow for missing minutes + (Bug#13750). + + 2014-08-05 Lars Magne Ingebrigtsen * image-mode.el (image-toggle-display-image): Always rescale images === modified file 'lisp/calendar/icalendar.el' --- lisp/calendar/icalendar.el 2014-07-30 16:25:58 +0000 +++ lisp/calendar/icalendar.el 2014-08-06 18:19:34 +0000 @@ -896,10 +896,16 @@ (defun icalendar--diarytime-to-isotime (timestring ampmstring) "Convert a time like 9:30pm to an iso-conform string like T213000. -In this example the TIMESTRING would be \"9:30\" and the AMPMSTRING -would be \"pm\"." +In this example the TIMESTRING would be \"9:30\" and the +AMPMSTRING would be \"pm\". The minutes may be missing as long +as the colon is missing as well, i.e. \"9\" is allowed as +TIMESTRING and has the same result as \"9:00\"." (if timestring - (let ((starttimenum (read (icalendar--rris ":" "" timestring)))) + (let* ((parts (save-match-data (split-string timestring ":"))) + (h (car parts)) + (m (if (cdr parts) (cadr parts) + (if (> (length h) 2) "" "00"))) + (starttimenum (read (concat h m)))) ;; take care of am/pm style ;; Be sure *not* to convert 12:00pm - 12:59pm to 2400-2459 (if (and ampmstring (string= "pm" ampmstring) (< starttimenum 1200)) @@ -1231,9 +1237,9 @@ (if (string-match (concat nonmarker "\\([^ /]+[ /]+[^ /]+[ /]+[^ ]+\\)\\s-*" ; date - "\\(\\([0-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?" ; start time + "\\(\\([0-9][0-9]?\\(:[0-9][0-9]\\)?\\)\\([ap]m\\)?" ; start time "\\(" - "-\\([0-9][0-9]?:[0-9][0-9]\\)\\([ap]m\\)?\\)?" ; end time + "-\\([0-9][0-9]?\\(:[0-9][0-9]\\)?\\)\\([ap]m\\)?\\)?" ; end time "\\)?" "\\s-*\\(.*?\\) ?$") entry-main) @@ -1250,25 +1256,25 @@ (match-beginning 3) (match-end 3)) nil) - (if (match-beginning 4) + (if (match-beginning 5) (substring entry-main - (match-beginning 4) - (match-end 4)) + (match-beginning 5) + (match-end 5)) nil))) (endtimestring (icalendar--diarytime-to-isotime - (if (match-beginning 6) - (substring entry-main - (match-beginning 6) - (match-end 6)) - nil) (if (match-beginning 7) (substring entry-main (match-beginning 7) (match-end 7)) + nil) + (if (match-beginning 9) + (substring entry-main + (match-beginning 9) + (match-end 9)) nil))) (summary (icalendar--convert-string-for-export - (substring entry-main (match-beginning 8) - (match-end 8))))) + (substring entry-main (match-beginning 10) + (match-end 10))))) (icalendar--dmsg "ordinary %s" entry-main) (unless startisostring === modified file 'test/ChangeLog' --- test/ChangeLog 2014-08-03 20:34:33 +0000 +++ test/ChangeLog 2014-08-06 18:19:34 +0000 @@ -1,3 +1,9 @@ +2014-08-06 Ulf Jasper + + * automated/icalendar-tests.el + (icalendar--convert-ordinary-to-ical), + (icalendar--diarytime-to-isotime): More testcases (Bug#13750). + 2014-08-03 Glenn Morris * automated/Makefile.in (check-tar): New rule. === modified file 'test/automated/icalendar-tests.el' --- test/automated/icalendar-tests.el 2014-08-02 05:44:18 +0000 +++ test/automated/icalendar-tests.el 2014-08-06 18:19:34 +0000 @@ -220,6 +220,15 @@ (car result))) (should (string= "subject" (cadr result))) + ;; with start time + (setq result (icalendar--convert-ordinary-to-ical + "&?" "&2010 2 15 12:34 s")) + (should (= 2 (length result))) + (should (string= (concat "\nDTSTART;VALUE=DATE-TIME:20100215T123400" + "\nDTEND;VALUE=DATE-TIME:20100215T133400") + (car result))) + (should (string= "s" (cadr result))) + ;; with time (setq result (icalendar--convert-ordinary-to-ical "&?" "&2010 2 15 12:34-23:45 s")) @@ -267,7 +276,9 @@ (should (string= "T120100" (icalendar--diarytime-to-isotime "1201" "pm"))) (should (string= "T125900" - (icalendar--diarytime-to-isotime "1259" "pm")))) + (icalendar--diarytime-to-isotime "1259" "pm"))) + (should (string= "T150000" + (icalendar--diarytime-to-isotime "3" "pm")))) (ert-deftest icalendar--datetime-to-diary-date () "Test method for `icalendar--datetime-to-diary-date'." ------------------------------------------------------------ revno: 117655 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2014-08-06 11:14:08 +0000 message: gnus-sum.el (gnus-summary-expire-articles): Revert last change diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-08-06 00:33:37 +0000 +++ lisp/gnus/ChangeLog 2014-08-06 11:14:08 +0000 @@ -1,3 +1,7 @@ +2014-08-06 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-expire-articles): Revert. + 2014-08-05 Eric Abrahamsen * gnus-sum.el (gnus-summary-expire-articles): Functions registered to === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2014-08-06 00:33:37 +0000 +++ lisp/gnus/gnus-sum.el 2014-08-06 11:14:08 +0000 @@ -10449,10 +10449,7 @@ (gnus-data-header (assoc article (gnus-data-list nil))) gnus-newsgroup-name - (if (fboundp nnmail-expiry-target) - (funcall nnmail-expiry-target - gnus-newsgroup-name) - nnmail-expiry-target) + nil nil))))))) (gnus-message 6 "Expiring articles...done"))))) ------------------------------------------------------------ revno: 117654 author: Eric Abrahamsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2014-08-06 00:33:37 +0000 message: * gnus-sum.el (gnus-summary-expire-articles): Functions registered to the gnus-summary-article-expire-hook should be told where the function is going. In particular, the Gnus registry might want to know. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-08-06 00:31:29 +0000 +++ lisp/gnus/ChangeLog 2014-08-06 00:33:37 +0000 @@ -1,3 +1,9 @@ +2014-08-05 Eric Abrahamsen + + * gnus-sum.el (gnus-summary-expire-articles): Functions registered to + the gnus-summary-article-expire-hook should be told where the function + is going. In particular, the Gnus registry might want to know. + 2014-07-31 Tassilo Horn * gnus-msg.el (gnus-inews-insert-gcc): Allow `gcc-self' to be a list of === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2014-06-22 05:43:58 +0000 +++ lisp/gnus/gnus-sum.el 2014-08-06 00:33:37 +0000 @@ -10449,7 +10449,10 @@ (gnus-data-header (assoc article (gnus-data-list nil))) gnus-newsgroup-name - nil + (if (fboundp nnmail-expiry-target) + (funcall nnmail-expiry-target + gnus-newsgroup-name) + nnmail-expiry-target) nil))))))) (gnus-message 6 "Expiring articles...done"))))) ------------------------------------------------------------ revno: 117653 author: Tassilo Horn committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2014-08-06 00:31:29 +0000 message: lisp/gnus/ChangeLog (2014-07-31): Add missing entry diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-07-22 06:37:31 +0000 +++ lisp/gnus/ChangeLog 2014-08-06 00:31:29 +0000 @@ -1,3 +1,8 @@ +2014-07-31 Tassilo Horn + + * gnus-msg.el (gnus-inews-insert-gcc): Allow `gcc-self' to be a list of + groups and t. + 2014-07-22 Katsumi Yamaoka * gnus-utils.el (gnus-recursive-directory-files): ------------------------------------------------------------ revno: 117652 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2014-08-05 22:01:51 +0300 message: lisp/ChangeLog: Fix a typo in last entry. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-05 18:18:39 +0000 +++ lisp/ChangeLog 2014-08-05 19:01:51 +0000 @@ -1,6 +1,6 @@ 2014-08-05 Lars Magne Ingebrigtsen - * image-mode.el (image-toggle-display-image): Alway rescale images + * image-mode.el (image-toggle-display-image): Always rescale images to not be bigger than the current window. 2014-08-05 Eric Brown (tiny change) ------------------------------------------------------------ revno: 117651 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2014-08-05 20:18:39 +0200 message: Use a max-width when displaying images * lisp/image-mode.el (image-toggle-display-image): Alway rescale images to not be bigger than the current window. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-05 18:15:52 +0000 +++ lisp/ChangeLog 2014-08-05 18:18:39 +0000 @@ -1,3 +1,8 @@ +2014-08-05 Lars Magne Ingebrigtsen + + * image-mode.el (image-toggle-display-image): Alway rescale images + to not be bigger than the current window. + 2014-08-05 Eric Brown (tiny change) * net/eww.el (eww-bookmarks-directory): New variable. === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2014-04-21 14:34:49 +0000 +++ lisp/image-mode.el 2014-08-05 18:18:39 +0000 @@ -638,8 +638,14 @@ (string-make-unibyte (buffer-substring-no-properties (point-min) (point-max))) filename)) - (type (image-type file-or-data nil data-p)) - (image (create-image file-or-data type data-p)) + (edges (window-inside-pixel-edges + (get-buffer-window (current-buffer)))) + (type (if (fboundp 'imagemagick-types) + 'imagemagick + (image-type file-or-data nil data-p))) + (image (create-image file-or-data type data-p + :max-width (- (nth 2 edges) (nth 0 edges)) + :max-height (- (nth 3 edges) (nth 1 edges)))) (inhibit-read-only t) (buffer-undo-list t) (modified (buffer-modified-p)) ------------------------------------------------------------ revno: 117650 author: Eric Brown committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2014-08-05 20:15:52 +0200 message: lisp/net/eww.el (eww-bookmarks-directory): New variable. * lisp/net/eww.el (eww-bookmarks-directory): New variable. (eww-write-bookmarks): Use it. (eww-read-bookmarks): Ditto. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-05 18:15:03 +0000 +++ lisp/ChangeLog 2014-08-05 18:15:52 +0000 @@ -1,3 +1,9 @@ +2014-08-05 Eric Brown (tiny change) + + * net/eww.el (eww-bookmarks-directory): New variable. + (eww-write-bookmarks): Use it. + (eww-read-bookmarks): Ditto. + 2014-08-05 Lars Magne Ingebrigtsen * net/shr.el (shr-copy-url): Also copy the image URL. === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2014-06-27 00:48:34 +0000 +++ lisp/net/eww.el 2014-08-05 18:15:52 +0000 @@ -57,6 +57,12 @@ :group 'eww :type 'string) +(defcustom eww-bookmarks-directory user-emacs-directory + "Directory where bookmark files will be stored." + :version "24.5" + :group 'eww + :type 'string) + (defcustom eww-use-external-browser-for-content-type "\\`\\(video/\\|audio/\\|application/ogg\\)" "Always use external browser for specified content-type." @@ -1118,12 +1124,12 @@ (message "Bookmarked %s (%s)" eww-current-url eww-current-title)))) (defun eww-write-bookmarks () - (with-temp-file (expand-file-name "eww-bookmarks" user-emacs-directory) + (with-temp-file (expand-file-name "eww-bookmarks" eww-bookmarks-directory) (insert ";; Auto-generated file; don't edit\n") (pp eww-bookmarks (current-buffer)))) (defun eww-read-bookmarks () - (let ((file (expand-file-name "eww-bookmarks" user-emacs-directory))) + (let ((file (expand-file-name "eww-bookmarks" eww-bookmarks-directory))) (setq eww-bookmarks (unless (zerop (or (nth 7 (file-attributes file)) 0)) (with-temp-buffer ------------------------------------------------------------ revno: 117649 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2014-08-05 20:15:03 +0200 message: * lisp/net/shr.el (shr-copy-url): Also copy the image URL. * lisp/net/shr.el (shr-copy-url): Also copy the image URL. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-05 08:13:28 +0000 +++ lisp/ChangeLog 2014-08-05 18:15:03 +0000 @@ -1,3 +1,7 @@ +2014-08-05 Lars Magne Ingebrigtsen + + * net/shr.el (shr-copy-url): Also copy the image URL. + 2014-08-05 Michael Albinus * net/tramp-cache.el (tramp-flush-file-function): Suppress function === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2014-04-14 22:01:54 +0000 +++ lisp/net/shr.el 2014-08-05 18:15:03 +0000 @@ -214,12 +214,16 @@ (overlay-put overlay 'before-string nil)))) (forward-line 1))))) -(defun shr-copy-url () +(defun shr-copy-url (&optional image-url) "Copy the URL under point to the kill ring. +If IMAGE-URL (the prefix) is non-nil, or there is no link under +point, but there is an image under point then copy the URL of the +image under point instead. If called twice, then try to fetch the URL and see whether it redirects somewhere else." - (interactive) - (let ((url (get-text-property (point) 'shr-url))) + (interactive "P") + (let ((url (or (get-text-property (point) 'shr-url) + (get-text-property (point) 'image-url)))) (cond ((not url) (message "No URL under point")) ------------------------------------------------------------ revno: 117648 committer: martin rudalics branch nick: trunk timestamp: Tue 2014-08-05 10:25:28 +0200 message: Don't redeem scroll bars that have been turned off. * w32term.c (w32_redeem_scroll_bar): * xterm.c (XTredeem_scroll_bar): Revert part of last change by not redeeming scroll bars that have been turned off. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-05 05:43:35 +0000 +++ src/ChangeLog 2014-08-05 08:25:28 +0000 @@ -1,3 +1,9 @@ +2014-08-05 Martin Rudalics + + * w32term.c (w32_redeem_scroll_bar): + * xterm.c (XTredeem_scroll_bar): Revert part of last change by + not redeeming scroll bars that have been turned off. + 2014-08-05 Dmitry Antipov * keyboard.c (safe_run_hooks): Follow the convenient style to bind === modified file 'src/w32term.c' --- src/w32term.c 2014-08-04 16:47:27 +0000 +++ src/w32term.c 2014-08-05 08:25:28 +0000 @@ -4041,7 +4041,7 @@ if (NILP (w->vertical_scroll_bar) && NILP (w->horizontal_scroll_bar)) emacs_abort (); - if (!NILP (w->vertical_scroll_bar)) + if (!NILP (w->vertical_scroll_bar) && WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->vertical_scroll_bar); /* Unlink it from the condemned list. */ @@ -4076,7 +4076,7 @@ } horizontal: - if (!NILP (w->horizontal_scroll_bar)) + if (!NILP (w->horizontal_scroll_bar) && WINDOW_HAS_HORIZONTAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->horizontal_scroll_bar); /* Unlink it from the condemned list. */ === modified file 'src/xterm.c' --- src/xterm.c 2014-08-04 16:47:27 +0000 +++ src/xterm.c 2014-08-05 08:25:28 +0000 @@ -5948,7 +5948,7 @@ if (NILP (w->vertical_scroll_bar) && NILP (w->horizontal_scroll_bar)) emacs_abort (); - if (!NILP (w->vertical_scroll_bar)) + if (!NILP (w->vertical_scroll_bar) && WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->vertical_scroll_bar); /* Unlink it from the condemned list. */ @@ -5983,7 +5983,7 @@ } horizontal: - if (!NILP (w->horizontal_scroll_bar)) + if (!NILP (w->horizontal_scroll_bar) && WINDOW_HAS_HORIZONTAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->horizontal_scroll_bar); /* Unlink it from the condemned list. */