------------------------------------------------------------ revno: 117670 committer: Paul Eggert branch nick: trunk timestamp: Fri 2014-08-08 23:57:59 -0700 message: Merge from gnulib. This incorporates: 2014-08-07 getdtablesize: fall back on sysconf (_SC_OPEN_MAX) 2014-08-05 sys_select: fix FD_ZERO problem on Solaris 10 * lib/getdtablesize.c, lib/sys_select.in.h: Update from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-07 10:15:52 +0000 +++ ChangeLog 2014-08-09 06:57:59 +0000 @@ -1,3 +1,10 @@ +2014-08-09 Paul Eggert + + Merge from gnulib, incorporating: + 2014-08-07 getdtablesize: fall back on sysconf (_SC_OPEN_MAX) + 2014-08-05 sys_select: fix FD_ZERO problem on Solaris 10 + * lib/getdtablesize.c, lib/sys_select.in.h: Update from gnulib. + 2014-08-07 Reuben Thomas * README: ``MSDOG'' becomes ``MS-DOS''. === modified file 'lib/getdtablesize.c' --- lib/getdtablesize.c 2014-01-01 07:43:34 +0000 +++ lib/getdtablesize.c 2014-08-09 06:57:59 +0000 @@ -104,4 +104,12 @@ return getdtablesize (); } +#elif defined _SC_OPEN_MAX + +int +getdtablesize (void) +{ + return sysconf (_SC_OPEN_MAX); +} + #endif === modified file 'lib/sys_select.in.h' --- lib/sys_select.in.h 2014-01-01 07:43:34 +0000 +++ lib/sys_select.in.h 2014-08-09 06:57:59 +0000 @@ -24,8 +24,8 @@ On Cygwin, includes . Simply delegate to the system's header in this case. */ #if (@HAVE_SYS_SELECT_H@ \ + && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H \ && ((defined __osf__ && defined _SYS_TYPES_H_ \ - && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ && defined _OSF_SOURCE) \ || (defined __sun && defined _SYS_TYPES_H \ && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ @@ -36,12 +36,13 @@ #elif (@HAVE_SYS_SELECT_H@ \ && (defined _CYGWIN_SYS_TIME_H \ - || (defined __osf__ && defined _SYS_TIME_H_ \ - && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ - && defined _OSF_SOURCE) \ - || (defined __sun && defined _SYS_TIME_H \ - && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ - || defined __EXTENSIONS__)))) + || (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ + && ((defined __osf__ && defined _SYS_TIME_H_ \ + && defined _OSF_SOURCE) \ + || (defined __sun && defined _SYS_TIME_H \ + && (! (defined _XOPEN_SOURCE \ + || defined _POSIX_C_SOURCE) \ + || defined __EXTENSIONS__)))))) # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ ------------------------------------------------------------ revno: 117669 committer: R?diger Sonderfeld branch nick: trunk timestamp: Fri 2014-08-08 16:35:40 +0200 message: ibuffer.el (ibuffer-mode-map): Use toggle button for `ibuffer-auto-mode' menu entry. (ibuffer-mode-hook): Add `ibuffer-auto-mode' customization option. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-08 14:05:16 +0000 +++ lisp/ChangeLog 2014-08-08 14:35:40 +0000 @@ -1,3 +1,9 @@ +2014-08-08 Rüdiger Sonderfeld + + * ibuffer.el (ibuffer-mode-map): Use toggle button for + `ibuffer-auto-mode' menu entry. + (ibuffer-mode-hook): Add `ibuffer-auto-mode' customization option. + 2014-08-08 Matthias Meulien * progmodes/prog-mode.el (prog-mode-hook): Make customizable. === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2014-01-01 07:43:34 +0000 +++ lisp/ibuffer.el 2014-08-08 14:35:40 +0000 @@ -350,6 +350,7 @@ (defcustom ibuffer-mode-hook nil "Hook run upon entry into `ibuffer-mode'." :type 'hook + :options '(ibuffer-auto-mode) :group 'ibuffer) (defcustom ibuffer-load-hook nil @@ -706,7 +707,8 @@ '(menu-item "Diff with file" ibuffer-diff-with-file :help "View the differences between this buffer and its file")) (define-key-after map [menu-bar view auto-mode] - '(menu-item "Toggle Auto Mode" ibuffer-auto-mode + '(menu-item "Auto Mode" ibuffer-auto-mode + :button (:toggle . ibuffer-auto-mode) :help "Attempt to automatically update the Ibuffer buffer")) (define-key-after map [menu-bar view customize] '(menu-item "Customize Ibuffer" ibuffer-customize ------------------------------------------------------------ revno: 117668 committer: R?diger Sonderfeld branch nick: trunk timestamp: Fri 2014-08-08 16:05:16 +0200 message: lisp/ChangeLog: Fix last entry. I did not realize that a bug was filed for that patch. Also "make" instead of "made". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-08 13:51:47 +0000 +++ lisp/ChangeLog 2014-08-08 14:05:16 +0000 @@ -1,6 +1,7 @@ 2014-08-08 Matthias Meulien - * progmodes/prog-mode.el (prog-mode-hook): Made customizable. + * progmodes/prog-mode.el (prog-mode-hook): Make customizable. + (Bug#16394) 2014-08-07 Martin Rudalics ------------------------------------------------------------ revno: 117667 author: Matthias Meulien committer: R?diger Sonderfeld branch nick: trunk timestamp: Fri 2014-08-08 15:51:47 +0200 message: progmodes/prog-mode.el (prog-mode-hook): Made customizable. https://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00353.html diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-07 14:34:06 +0000 +++ lisp/ChangeLog 2014-08-08 13:51:47 +0000 @@ -1,3 +1,7 @@ +2014-08-08 Matthias Meulien + + * progmodes/prog-mode.el (prog-mode-hook): Made customizable. + 2014-08-07 Martin Rudalics * window.el (window--min-size-1): Explicitly set WINDOW arg in === modified file 'lisp/progmodes/prog-mode.el' --- lisp/progmodes/prog-mode.el 2014-05-29 03:45:29 +0000 +++ lisp/progmodes/prog-mode.el 2014-08-08 13:51:47 +0000 @@ -35,6 +35,13 @@ "Generic programming mode, from which others derive." :group 'languages) +(defcustom prog-mode-hook nil + "Normal hook run when entering Text mode and many related modes." + :type 'hook + :options '(flyspell-prog-mode abbrev-mode flymake-mode linum-mode + prettify-symbols-mode) + :group 'prog-mode) + (defvar prog-mode-map (let ((map (make-sparse-keymap))) (define-key map [?\C-\M-q] 'prog-indent-sexp) ------------------------------------------------------------ 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 ()