Now on revision 107876. ------------------------------------------------------------ revno: 107876 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2012-04-11 22:04:29 -0400 message: Make generic sysfs support apply for yeeloong as well. * lisp/battery.el (battery--linux-sysfs-regexp): New const. (battery-status-function): Use it. Remove yeeloong special case. (battery-yeeloong-sysfs): Remove. (battery-echo-area-format): Remove yeeloong special case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 21:37:13 +0000 +++ lisp/ChangeLog 2012-04-12 02:04:29 +0000 @@ -1,3 +1,10 @@ +2012-04-12 Stefan Monnier + + * battery.el (battery--linux-sysfs-regexp): New const. + (battery-status-function): Use it. Remove yeeloong special case. + (battery-yeeloong-sysfs): Remove. + (battery-echo-area-format): Remove yeeloong special case. + 2012-04-11 Stefan Monnier * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil. === modified file 'lisp/battery.el' --- lisp/battery.el 2012-04-10 23:24:31 +0000 +++ lisp/battery.el 2012-04-12 02:04:29 +0000 @@ -39,6 +39,9 @@ :prefix "battery-" :group 'hardware) +;; Either BATn or yeeloong-bat, basically. +(defconst battery--linux-sysfs-regexp "[bB][aA][tT][0-9]?$") + (defcustom battery-status-function (cond ((and (eq system-type 'gnu/linux) (file-readable-p "/proc/apm")) @@ -48,12 +51,9 @@ 'battery-linux-proc-acpi) ((and (eq system-type 'gnu/linux) (file-directory-p "/sys/class/power_supply/") - (directory-files "/sys/class/power_supply/" nil "BAT[0-9]$")) + (directory-files "/sys/class/power_supply/" nil + battery--linux-sysfs-regexp)) 'battery-linux-sysfs) - ((and (eq system-type 'gnu/linux) - (file-directory-p "/sys/class/power_supply/yeeloong-bat/") - (directory-files "/sys/class/power_supply/yeeloong-bat/" nil "charge_")) - 'battery-yeeloong-sysfs) ((and (eq system-type 'darwin) (condition-case nil (with-temp-buffer @@ -81,8 +81,6 @@ "Power %L, battery %B (%p%% load)") ((eq battery-status-function 'battery-pmset) "%L power, battery %B (%p%% load, remaining time %t)") - ((eq battery-status-function 'battery-yeeloong-sysfs) - "%L power, battery %B (%p%% load, remaining time %t)") (battery-status-function "Power %L, battery %B (%p%% load, remaining time %t)")) "Control string formatting the string to display in the echo area. @@ -448,7 +446,8 @@ (with-temp-buffer (dolist (dir (ignore-errors (directory-files - "/sys/class/power_supply/" t "BAT[0-9]$"))) + "/sys/class/power_supply/" t + battery--linux-sysfs-regexp))) (erase-buffer) (ignore-errors (insert-file-contents (expand-file-name "uevent" dir))) @@ -525,91 +524,6 @@ "AC" "BAT") "N/A"))))) - -(defun battery-yeeloong-sysfs () - "Get ACPI status information from Linux (the kernel). -This function works only on the Lemote Yeeloong. - -The following %-sequences are provided: -%c Current capacity (mAh) -%r Current rate -%B Battery status (verbose) -%b Battery status, empty means high, `-' means low, - `!' means critical, and `+' means charging -%L AC line status (verbose) -%p Battery load percentage -%m Remaining time (to charge or discharge) in minutes -%h Remaining time (to charge or discharge) in hours -%t Remaining time (to charge or discharge) in the form `h:min'" - - (let (capacity - capacity-level - status - ac-online - hours - current-now - charge-full - charge-now) - - (with-temp-buffer - (ignore-errors - (insert-file-contents "/sys/class/power_supply/yeeloong-bat/uevent") - (goto-char 1) - (search-forward "POWER_SUPPLY_CHARGE_NOW=") - (setq charge-now (read (current-buffer))) - (goto-char 1) - (search-forward "POWER_SUPPLY_CHARGE_FULL=") - (setq charge-full (read (current-buffer))) - (goto-char 1) - (search-forward "POWER_SUPPLY_CURRENT_NOW=") - (setq current-now (read (current-buffer))) - (goto-char 1) - (search-forward "POWER_SUPPLY_CAPACITY_LEVEL=") - (setq capacity-level (buffer-substring (point) (line-end-position))) - (goto-char 1) - (search-forward "POWER_SUPPLY_STATUS=") - (setq status (buffer-substring (point) (line-end-position)))) - - (erase-buffer) - (ignore-errors - (insert-file-contents - "/sys/class/power_supply/yeeloong-ac/online") - (goto-char 1) - (setq ac-online (read (current-buffer))) - (erase-buffer))) - - - (setq capacity (round (/ (* charge-now 100.0) charge-full))) - (when (and current-now (not (= current-now 0))) - (if (< current-now 0) - ;; Charging - (setq hours (/ (- charge-now charge-full) (+ 0.0 current-now))) - ;; Discharging - (setq hours (/ charge-now (+ 0.0 current-now))))) - - (list (cons ?c (if charge-now - (number-to-string charge-now) - "N/A")) - (cons ?r current-now) - (cons ?B (cond ((equal capacity-level "Full") "full") - ((equal status "Charging") "charging") - ((equal capacity-level "Low") "low") - ((equal capacity-level "Critical") "critical") - (t "high"))) - (cons ?b (cond ((equal capacity-level "Full") " ") - ((equal status "Charging") "+") - ((equal capacity-level "Low") "-") - ((equal capacity-level "Critical") "!") - (t " "))) - (cons ?h (if hours (number-to-string hours) "N/A")) - (cons ?m (if hours (number-to-string (* 60 hours)) "N/A")) - (cons ?t (if hours - (format "%d:%d" - (/ (round (* 60 hours)) 60) - (% (round (* 60 hours)) 60)) - "N/A")) - (cons ?p (if capacity (number-to-string capacity) "N/A")) - (cons ?L (if (eq ac-online 1) "AC" "BAT"))))) ;;; `pmset' interface for Darwin (OS X). ------------------------------------------------------------ revno: 107875 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2012-04-11 17:37:13 -0400 message: * lisp/imenu.el (imenu-add-to-menubar): `current-local-map' can be nil. Reported by Noah Friedman. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 18:13:20 +0000 +++ lisp/ChangeLog 2012-04-11 21:37:13 +0000 @@ -1,5 +1,8 @@ 2012-04-11 Stefan Monnier + * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil. + Reported by Noah Friedman. + * subr.el (read-passwd): Use read-string. 2012-04-11 Lars Magne Ingebrigtsen === modified file 'lisp/imenu.el' --- lisp/imenu.el 2012-03-15 01:38:40 +0000 +++ lisp/imenu.el 2012-04-11 21:37:13 +0000 @@ -963,7 +963,8 @@ imenu-generic-expression (not (eq imenu-create-index-function 'imenu-default-create-index-function))) - (unless (keymapp (lookup-key (current-local-map) [menu-bar index])) + (unless (and (current-local-map) + (keymapp (lookup-key (current-local-map) [menu-bar index]))) (let ((newmap (make-sparse-keymap))) (set-keymap-parent newmap (current-local-map)) (setq imenu--last-menubar-index-alist nil) ------------------------------------------------------------ revno: 107874 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2012-04-11 14:13:20 -0400 message: * lisp/subr.el (read-passwd): Use read-string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 16:09:39 +0000 +++ lisp/ChangeLog 2012-04-11 18:13:20 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Stefan Monnier + + * subr.el (read-passwd): Use read-string. + 2012-04-11 Lars Magne Ingebrigtsen * vcursor.el (vcursor-move): Increase the priority of the overlay === modified file 'lisp/subr.el' --- lisp/subr.el 2012-04-09 13:05:48 +0000 +++ lisp/subr.el 2012-04-11 18:13:20 +0000 @@ -871,6 +871,7 @@ (defsubst eventp (obj) "True if the argument is an event object." (or (and (integerp obj) + ;; FIXME: Why bother? ;; Filter out integers too large to be events. ;; M is the biggest modifier. (zerop (logand obj (lognot (1- (lsh ?\M-\^@ 1))))) @@ -1989,6 +1990,10 @@ So escape sequences and keyboard encoding are taken into account. When there's an ambiguity because the key looks like the prefix of some sort of escape sequence, the ambiguity is resolved via `read-key-delay'." + ;; This overriding-terminal-local-map binding also happens to + ;; disable quail's input methods, so although read-key-sequence + ;; always inherits the input method, in practice read-key does not + ;; inherit the input method (at least not if it's based on quail). (let ((overriding-terminal-local-map read-key-empty-map) (overriding-local-map nil) (echo-keystrokes 0) @@ -2093,77 +2098,45 @@ This function echoes `.' for each character that the user types. -The user ends with RET, LFD, or ESC. DEL or C-h rubs out. -C-y yanks the current kill. C-u kills line. -C-g quits; if `inhibit-quit' was non-nil around this function, -then it returns nil if the user types C-g, but `quit-flag' remains set. - Once the caller uses the password, it can erase the password by doing (clear-string STRING)." - (with-local-quit - (if confirm - (let (success) - (while (not success) - (let ((first (read-passwd prompt nil default)) - (second (read-passwd "Confirm password: " nil default))) - (if (equal first second) - (progn - (and (arrayp second) (clear-string second)) - (setq success first)) - (and (arrayp first) (clear-string first)) - (and (arrayp second) (clear-string second)) - (message "Password not repeated accurately; please start over") - (sit-for 1)))) - success) - (let ((pass nil) - ;; Copy it so that add-text-properties won't modify - ;; the object that was passed in by the caller. - (prompt (copy-sequence prompt)) - (c 0) - (echo-keystrokes 0) - (cursor-in-echo-area t) - (message-log-max nil) - (stop-keys (list 'return ?\r ?\n ?\e)) - (rubout-keys (list 'backspace ?\b ?\177))) - (add-text-properties 0 (length prompt) - minibuffer-prompt-properties prompt) - (while (progn (message "%s%s" - prompt - (make-string (length pass) ?.)) - (setq c (read-key)) - (not (memq c stop-keys))) - (clear-this-command-keys) - (cond ((memq c rubout-keys) ; rubout - (when (> (length pass) 0) - (let ((new-pass (substring pass 0 -1))) - (and (arrayp pass) (clear-string pass)) - (setq pass new-pass)))) - ((eq c ?\C-g) (keyboard-quit)) - ((not (numberp c))) - ((= c ?\C-u) ; kill line - (and (arrayp pass) (clear-string pass)) - (setq pass "")) - ((= c ?\C-y) ; yank - (let* ((str (condition-case nil - (current-kill 0) - (error nil))) - new-pass) - (when str - (setq new-pass - (concat pass - (substring-no-properties str))) - (and (arrayp pass) (clear-string pass)) - (setq c ?\0) - (setq pass new-pass)))) - ((characterp c) ; insert char - (let* ((new-char (char-to-string c)) - (new-pass (concat pass new-char))) - (and (arrayp pass) (clear-string pass)) - (clear-string new-char) - (setq c ?\0) - (setq pass new-pass))))) - (message nil) - (or pass default ""))))) + (if confirm + (let (success) + (while (not success) + (let ((first (read-passwd prompt nil default)) + (second (read-passwd "Confirm password: " nil default))) + (if (equal first second) + (progn + (and (arrayp second) (clear-string second)) + (setq success first)) + (and (arrayp first) (clear-string first)) + (and (arrayp second) (clear-string second)) + (message "Password not repeated accurately; please start over") + (sit-for 1)))) + success) + (let (minibuf) + (minibuffer-with-setup-hook + (lambda () + (setq minibuf (current-buffer)) + ;; Turn off electricity. + (set (make-local-variable 'post-self-insert-hook) nil) + (add-hook 'after-change-functions + (lambda (beg end len) + (clear-this-command-keys) + (setq beg (min end (max (minibuffer-prompt-end) + beg))) + (dotimes (i (- end beg)) + (put-text-property (+ i beg) (+ 1 i beg) + 'display (string ?.)))) + nil t)) + (unwind-protect + (read-string prompt nil + (let ((sym (make-symbol "forget-history"))) + (set sym nil) + sym) + default) + (when (buffer-live-p minibuf) + (with-current-buffer minibuf (erase-buffer)))))))) ;; This should be used by `call-interactively' for `n' specs. (defun read-number (prompt &optional default) @@ -3557,8 +3530,7 @@ To replace only the first match (if any), make REGEXP match up to \\' and replace a sub-expression, e.g. (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil nil 1) - => \" bar foo\" -" + => \" bar foo\"" ;; To avoid excessive consing from multiple matches in long strings, ;; don't just call `replace-match' continually. Walk down the ------------------------------------------------------------ revno: 107873 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-04-11 09:09:39 -0700 message: Changelog fix diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 14:26:55 +0000 +++ lisp/ChangeLog 2012-04-11 16:09:39 +0000 @@ -13,7 +13,7 @@ * textmodes/artist.el (artist-mode): Convert artist-mode to use define-minor-mode (bug#10760). -2011-12-20 Wolfgang Jenkner +2012-04-11 Wolfgang Jenkner (tiny change) * lisp/progmodes/grep.el (rgrep): Tweak the find command line so that directories matching `grep-find-ignored-files' won't be ------------------------------------------------------------ revno: 107872 fixes bug(s): http://debbugs.gnu.org/9663 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 16:26:55 +0200 message: * vcursor.el (vcursor-move): Increase the priority of the overlay. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 14:22:36 +0000 +++ lisp/ChangeLog 2012-04-11 14:26:55 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Lars Magne Ingebrigtsen + + * vcursor.el (vcursor-move): Increase the priority of the overlay + (bug#9663). + 2012-04-11 Deniz Dogan * net/rcirc.el (rcirc-kill-channel-buffers): New variable. === modified file 'lisp/vcursor.el' --- lisp/vcursor.el 2012-02-08 02:12:24 +0000 +++ lisp/vcursor.el 2012-04-11 14:26:55 +0000 @@ -656,12 +656,13 @@ (or window-system (display-color-p) (overlay-put vcursor-overlay 'before-string vcursor-string)) - (overlay-put vcursor-overlay 'face 'vcursor)) + (overlay-put vcursor-overlay 'face 'vcursor) + ;; 200 is purely an arbitrary "high" number. See bug#9663. + (overlay-put vcursor-overlay 'priority 200)) (or leave-w (vcursor-find-window nil t)) ;; vcursor-window now contains the right buffer (or (pos-visible-in-window-p pt vcursor-window) - (set-window-point vcursor-window pt))) - ) + (set-window-point vcursor-window pt)))) (defun vcursor-insert (text) "Insert TEXT, respecting `vcursor-interpret-input'." ------------------------------------------------------------ revno: 107871 fixes bug(s): http://debbugs.gnu.org/5128 author: Deniz Dogan committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 16:22:36 +0200 message: Kill channel buffers when killing rcirc server buffers * net/rcirc.el (rcirc-kill-channel-buffers): New variable. (rcirc-kill-buffer-hook): Use it to kill channel buffers. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 11:57:21 +0000 +++ lisp/ChangeLog 2012-04-11 14:22:36 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Deniz Dogan + + * net/rcirc.el (rcirc-kill-channel-buffers): New variable. + (rcirc-kill-buffer-hook): Use it to kill channel buffers (bug#5128). + 2012-04-11 William Stevenson * textmodes/artist.el (artist-mode): Convert artist-mode to use === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2012-04-09 13:05:48 +0000 +++ lisp/net/rcirc.el 2012-04-11 14:22:36 +0000 @@ -361,6 +361,14 @@ :type 'string :group 'rcirc) +(defcustom rcirc-kill-channel-buffers nil + "When non-nil, kill channel buffers when the server buffer is killed. +Only the channel buffers associated with the server in question +will be killed." + :version "24.2" + :type 'boolean + :group 'rcirc) + (defvar rcirc-nick nil) (defvar rcirc-prompt-start-marker nil) @@ -1088,12 +1096,20 @@ :group 'rcirc) (defun rcirc-kill-buffer-hook () - "Part the channel when killing an rcirc buffer." + "Part the channel when killing an rcirc buffer. + +If `rcirc-kill-channel-buffers' is non-nil and the killed buffer +is a server buffer, kills all of the channel buffers associated +with it." (when (eq major-mode 'rcirc-mode) (when (and rcirc-log-flag rcirc-log-directory) (rcirc-log-write)) - (rcirc-clean-up-buffer "Killed buffer"))) + (rcirc-clean-up-buffer "Killed buffer") + (when (and rcirc-buffer-alist ;; it's a server buffer + rcirc-kill-channel-buffers) + (dolist (channel rcirc-buffer-alist) + (kill-buffer (cdr channel)))))) (defun rcirc-change-major-mode-hook () "Part the channel when changing the major-mode." ------------------------------------------------------------ revno: 107870 fixes bug(s): http://debbugs.gnu.org/4459 author: Vivek Dasmohapatra committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 15:43:03 +0200 message: (erc-nickserv-passwords): Don't display the password. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-04-10 04:43:35 +0000 +++ lisp/erc/ChangeLog 2012-04-11 13:43:03 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Vivek Dasmohapatra + + * erc-services.el (erc-nickserv-passwords): Don't display the + password (bug#4459). + 2012-04-10 Lars Magne Ingebrigtsen * erc-join.el (erc-server-join-channel): New function to look up === modified file 'lisp/erc/erc-services.el' --- lisp/erc/erc-services.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-services.el 2012-04-11 13:43:03 +0000 @@ -195,7 +195,8 @@ (repeat :tag "Nickname and password" (cons :tag "Identity" (string :tag "Nick") - (string :tag "Password")))))) + (string :tag "Password" + :secret ?*)))))) ;; Variables: ------------------------------------------------------------ revno: 107869 fixes bug(s): http://debbugs.gnu.org/10760 author: William Stevenson committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 13:57:21 +0200 message: (artist-mode): Convert artist-mode to use define-minor-mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 11:39:35 +0000 +++ lisp/ChangeLog 2012-04-11 11:57:21 +0000 @@ -1,3 +1,8 @@ +2012-04-11 William Stevenson + + * textmodes/artist.el (artist-mode): Convert artist-mode to use + define-minor-mode (bug#10760). + 2011-12-20 Wolfgang Jenkner * lisp/progmodes/grep.el (rgrep): Tweak the find command line so === modified file 'lisp/textmodes/artist.el' --- lisp/textmodes/artist.el 2012-04-09 13:05:48 +0000 +++ lisp/textmodes/artist.el 2012-04-11 11:57:21 +0000 @@ -1197,9 +1197,9 @@ ;;; --------------------------------- ;;;###autoload -(defun artist-mode (&optional state) +(define-minor-mode artist-mode "Toggle Artist mode. -With argument STATE, turn Artist mode on if STATE is positive. +With argument ARG, turn Artist mode on if ARG is positive. Artist lets you draw lines, squares, rectangles and poly-lines, ellipses and circles with your mouse and/or keyboard. @@ -1388,36 +1388,24 @@ Hooks - When entering artist-mode, the hook `artist-mode-init-hook' is called. - When quitting artist-mode, the hook `artist-mode-exit-hook' is called. + Turning the mode on or off runs `artist-mode-hook'. Keymap summary \\{artist-mode-map}" - (interactive) - (if (setq artist-mode - (if (null state) (not artist-mode) - (> (prefix-numeric-value state) 0))) - (artist-mode-init) - (artist-mode-exit))) - -;; insert our minor mode string -(or (assq 'artist-mode minor-mode-alist) - (setq minor-mode-alist - (cons '(artist-mode artist-mode-name) - minor-mode-alist))) - -;; insert our minor mode keymap -(or (assq 'artist-mode minor-mode-map-alist) - (setq minor-mode-map-alist - (cons (cons 'artist-mode artist-mode-map) - minor-mode-map-alist))) - + :init-value nil :group 'artist :lighter artist-mode-name + :keymap artist-mode-map + (cond ((null artist-mode) + ;; Turn mode off + (artist-mode-exit)) + (t + ;; Turn mode on + (artist-mode-init)))) ;; Init and exit (defun artist-mode-init () - "Init Artist mode. This will call the hook `artist-mode-init-hook'." + "Init Artist mode. This will call the hook `artist-mode-hook'." ;; Set up a conversion table for mapping tabs and new-lines to spaces. ;; the last case, 0, is for the last position in buffer/region, where ;; the `following-char' function returns 0. @@ -1459,15 +1447,13 @@ (progn (picture-mode) (message ""))) - (run-hooks 'artist-mode-init-hook) (artist-mode-line-show-curr-operation artist-key-is-drawing)) (defun artist-mode-exit () - "Exit Artist mode. This will call the hook `artist-mode-exit-hook'." + "Exit Artist mode. This will call the hook `artist-mode-hook'." (if (and artist-picture-compatibility (eq major-mode 'picture-mode)) (picture-mode-exit)) - (kill-local-variable 'next-line-add-newlines) - (run-hooks 'artist-mode-exit-hook)) + (kill-local-variable 'next-line-add-newlines)) (defun artist-mode-off () "Turn Artist mode off." ------------------------------------------------------------ revno: 107868 fixes bug(s): http://debbugs.gnu.org/10398 author: Daniel Colascione committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 13:43:55 +0200 message: Use the real vfork under Cygwin * s/cygwin.h: The vfork the #define in cygwin.h was protecting against is gone. It's better to use vfork now so that when Cygwin gains a new, working vfork, we use it automatically. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-11 02:36:04 +0000 +++ src/ChangeLog 2012-04-11 11:43:55 +0000 @@ -1,3 +1,9 @@ +2012-04-11 Daniel Colascione + + * s/cygwin.h: The vfork the #define in cygwin.h was protecting + against is gone. It's better to use vfork now so that when Cygwin + gains a new, working vfork, we use it automatically (bug#10398). + 2012-04-11 Stefan Monnier * window.c (save_window_save): Obey window-point-insertion-type. === modified file 'src/s/cygwin.h' --- src/s/cygwin.h 2012-01-19 07:21:25 +0000 +++ src/s/cygwin.h 2012-04-11 11:43:55 +0000 @@ -81,10 +81,6 @@ #define HAVE_SOCKETS -/* vfork() interacts badly with setsid(), causing ptys to fail to - change their controlling terminal */ -#define vfork fork - /* This should work (at least when compiling with gcc). But I have no way or intention to verify or even test it. If you encounter a problem with it, feel free to change this setting, but please add a comment here about ------------------------------------------------------------ revno: 107867 fixes bug(s): http://debbugs.gnu.org/10351 author: Wolfgang Jenkner committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 13:39:35 +0200 message: rgrep ignored file tweak * lisp/progmodes/grep.el (rgrep): Tweak the find command line so that directories matching `grep-find-ignored-files' won't be pruned. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 05:43:47 +0000 +++ lisp/ChangeLog 2012-04-11 11:39:35 +0000 @@ -1,3 +1,9 @@ +2011-12-20 Wolfgang Jenkner + + * lisp/progmodes/grep.el (rgrep): Tweak the find command line so + that directories matching `grep-find-ignored-files' won't be + pruned (bug#10351). + 2012-04-11 Chong Yidong * startup.el (command-line): Remove support for long-obsolete === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2012-04-09 13:05:48 +0000 +++ lisp/progmodes/grep.el 2012-04-11 11:39:35 +0000 @@ -1024,7 +1024,8 @@ (shell-quote-argument ")") " -prune -o ")) (and grep-find-ignored-files - (concat (shell-quote-argument "(") + (concat (shell-quote-argument "!") " -type d " + (shell-quote-argument "(") ;; we should use shell-quote-argument here " -name " (mapconcat ------------------------------------------------------------ revno: 107866 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-04-11 06:17:27 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-02-01 11:17:54 +0000 +++ autogen/Makefile.in 2012-04-11 10:17:27 +0000 @@ -152,7 +152,6 @@ C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@ C_SWITCH_X_SITE = @C_SWITCH_X_SITE@ -C_SWITCH_X_SYSTEM = @C_SWITCH_X_SYSTEM@ C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ @@ -332,6 +331,7 @@ GNULIB_WCTOMB = @GNULIB_WCTOMB@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ +GNUSTEP_CFLAGS = @GNUSTEP_CFLAGS@ GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@ GREP = @GREP@ GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@ === modified file 'autogen/configure' --- autogen/configure 2012-04-10 10:17:26 +0000 +++ autogen/configure 2012-04-11 10:17:27 +0000 @@ -1087,7 +1087,7 @@ S_FILE M_FILE X_TOOLKIT_TYPE -C_SWITCH_X_SYSTEM +GNUSTEP_CFLAGS C_SWITCH_X_SITE LD_SWITCH_X_SITE gameuser @@ -13413,7 +13413,7 @@ -C_SWITCH_X_SYSTEM= +GNUSTEP_CFLAGS= ### Use NeXTstep API to implement GUI. if test "${HAVE_NS}" = "yes"; then @@ -13430,7 +13430,7 @@ # See also .m.o rule in Makefile.in */ # FIXME: are all these flags really needed? Document here why. */ - C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" ## Extra CFLAGS applied to src/*.m files. GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE" fi ------------------------------------------------------------ revno: 107865 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-04-11 15:06:42 +0800 message: Note obsolescence of mouse-sel.el in NEWS. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-04-10 04:43:35 +0000 +++ etc/NEWS 2012-04-11 07:06:42 +0000 @@ -43,6 +43,10 @@ ** erc will look up server/channel names via auth-source and use the channel keys found, if any. +** Obsolete modes + +*** mouse-sel.el + * New Modes and Packages in Emacs 24.2 ------------------------------------------------------------ revno: 107864 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-04-11 13:43:47 +0800 message: * startup.el (command-line): Remove support for font-lock-face-attributes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 03:24:26 +0000 +++ lisp/ChangeLog 2012-04-11 05:43:47 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Chong Yidong + + * startup.el (command-line): Remove support for long-obsolete + variable font-lock-face-attributes. + 2012-04-11 Glenn Morris * vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug. === modified file 'lisp/startup.el' --- lisp/startup.el 2012-04-09 06:58:41 +0000 +++ lisp/startup.el 2012-04-11 05:43:47 +0000 @@ -1169,38 +1169,6 @@ (or mail-host-address (system-name)))))) - ;; Originally face attributes were specified via - ;; `font-lock-face-attributes'. Users then changed the default - ;; face attributes by setting that variable. However, we try and - ;; be back-compatible and respect its value if set except for - ;; faces where M-x customize has been used to save changes for the - ;; face. - (when (boundp 'font-lock-face-attributes) - (let ((face-attributes font-lock-face-attributes)) - (while face-attributes - (let* ((face-attribute (pop face-attributes)) - (face (car face-attribute))) - ;; Rustle up a `defface' SPEC from a - ;; `font-lock-face-attributes' entry. - (unless (get face 'saved-face) - (let ((foreground (nth 1 face-attribute)) - (background (nth 2 face-attribute)) - (bold-p (nth 3 face-attribute)) - (italic-p (nth 4 face-attribute)) - (underline-p (nth 5 face-attribute)) - face-spec) - (when foreground - (setq face-spec (cons ':foreground (cons foreground face-spec)))) - (when background - (setq face-spec (cons ':background (cons background face-spec)))) - (when bold-p - (setq face-spec (append '(:weight bold) face-spec))) - (when italic-p - (setq face-spec (append '(:slant italic) face-spec))) - (when underline-p - (setq face-spec (append '(:underline t) face-spec))) - (face-spec-set face (list (list t face-spec)) nil))))))) - ;; If parameter have been changed in the init file which influence ;; face realization, clear the face cache so that new faces will ;; be realized.