]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Sun, 5 Jun 2011 14:17:51 +0000 (16:17 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Sun, 5 Jun 2011 14:17:51 +0000 (16:17 +0200)
15 files changed:
1  2 
etc/NEWS
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/mail/sendmail.el
lisp/minibuffer.el
lisp/mouse.el
lisp/proced.el
lisp/shell.el
lisp/simple.el
lisp/textmodes/bibtex.el
src/ChangeLog
src/buffer.c
src/lisp.h
src/minibuf.c
src/xdisp.c

diff --cc etc/NEWS
Simple merge
diff --cc lisp/ChangeLog
index 27a9ec720c3989cc34050b2967b748d1a7a19582,2e0352a7bdf03a052c54f26d7a885b82c6b58169..2785d5ed3156e0d1f6b573450162b8359aa7cb58
 +2011-06-05  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (window-sides-alist): Remove.
 +      (display-buffer): Remove defgroup and all its members.
 +      (display-buffer-normalize-specifiers-1): Mention argument in
 +      doc-string.
 +      (display-buffer-normalize-specifiers-2): New function.
 +      (display-buffer-normalize-specifiers): Call
 +      display-buffer-normalize-specifiers-2.
 +      (display-buffer-alist-set): Take care of unset initial values.
 +      Add entry for display-buffer-mark-dedicated.  Reorder.
 +      (same-window-buffer-names, same-window-regexps)
 +      (special-display-frame-alist, special-display-function)
 +      (special-display-buffer-names, special-display-regexps)
 +      (pop-up-frame-alist, pop-up-frame-function)
 +      (split-window-preferred-function, split-height-threshold)
 +      (split-width-threshold, even-window-heights): Restore Emacs 23
 +      values, doc-strings and customization groups.
 +      (pop-up-frames, pop-up-windows, display-buffer-reuse-frames)
 +      (display-buffer-mark-dedicated): Restore Emacs 23 doc-strings and
 +      customization groups.  Initialize value to 'unset.
 +      (display-buffer-reuse-window): Quote lambda with #'.
 +
+ 2011-06-05  Roland Winkler  <winkler@gnu.org>
+       * textmodes/bibtex.el (bibtex-search-buffer): New variable.
+       (bibtex-search-entries): New command bound to C-c C-a.
+       (bibtex-display-entries): New function.
+ 2011-06-05  Roland Winkler  <winkler@gnu.org>
+       * textmodes/bibtex.el (bibtex-generate-url-list): Fix docstring.
+       (bibtex-insert-kill): After yanking insert newline if necessary.
+       (bibtex-initialize): Call bibtex-string-files-init only once.
+       (bibtex-mode): Do not call easy-menu-add.
+       (bibtex-validate-globally): Use save-excursion in bibtex buffers.
+       (bibtex-yank): Set arg properly if nil.
+ 2011-06-05  Roland Winkler  <winkler@gnu.org>
+       * textmodes/bibtex.el (bibtex-search-entry-globally): New
+       variable.
+       (bibtex-search-entry): Use it.
+ 2011-06-05  Roland Winkler  <winkler@gnu.org>
+       * textmodes/bibtex.el (bibtex-entry-format): New option
+       sort-fields.
+       (bibtex-format-entry, bibtex-reformat): Honor this option.
+       (bibtex-parse-entry): Return fields in proper order.
+ 2011-06-05  Juanma Barranquero  <lekktu@gmail.com>
+       * doc-view.el (doc-view-remove-if): Move computation of result out
+       of `dolist' to silence misleading lexical-binding warning.
+ 2011-06-04  Chong Yidong  <cyd@stupidchicken.com>
+       * emacs-lisp/timer.el (timer-activate): Remove unused arg.
+       (timer-activate, timer-activate-when-idle): Doc fix (Bug#8793).
+ 2011-06-04  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp-sh.el (tramp-find-shell): Apply workaround also for
+       "SunOS 5.10".
+ 2011-06-04  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-set-completion-function, tramp-parse-rhosts)
+       (tramp-parse-shosts, tramp-parse-sconfig, tramp-parse-shostkeys)
+       (tramp-parse-hosts, tramp-parse-passwd, tramp-parse-netrc)
+       (tramp-parse-putty):
+       * net/tramp-sh.el (tramp-completion-function-alist-rsh)
+       (tramp-completion-function-alist-ssh)
+       (tramp-completion-function-alist-telnet)
+       (tramp-completion-function-alist-su)
+       (tramp-completion-function-alist-putty): Set `tramp-autoload'
+       cookie.
+       * net/tramp-ftp.el:
+       * net/tramp-sh.el:
+       * net/tramp-smb.el: Set `tramp-autoload' cookie, and eval after
+       load "tramp.el" `tramp-set-completion-function'.
+ 2011-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * shell.el: Require and use pcomplete.
+       (shell-dynamic-complete-functions): Add pcomplete-completions-at-point.
+       (shell-completion-vars): Set pcomplete-default-completion-function.
+ 2011-06-04  Deniz Dogan  <deniz@dogan.se>
+       * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
+       `memq' (Bug#8799).
+ 2011-06-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * subr.el (make-progress-reporter): Add "..." by default (bug#8785).
+ 2011-06-02  Juanma Barranquero  <lekktu@gmail.com>
+       * bs.el (bs--mark-unmark, bs--nth-wrapper):
+       * mpc.el (mpc-select-extend, mpc-songpointer-context):
+       * vc/log-view.el (log-view-beginning-of-defun):
+       * vc/smerge-mode.el (smerge-apply-resolution-patch)
+       (smerge-refine-forward, smerge-refine-chopup-region):
+       Silence warning for unused `dotimes' counter variables.
+ 2011-06-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * net/tramp.el (tramp-with-progress-reporter): Rename from
+       with-progress-reporter.  Use `declare'.
+       * net/tramp-smb.el:
+       * net/tramp-sh.el:
+       * net/tramp-gvfs.el: Update all uses.
+ 2011-06-02  Jay Belanger  <jay.p.belanger@gmail.com>
+       * calc/calc.el (calc-kill-stack-buffer): Make sure that the trail
+       buffer isn't killed before making it current.
+ 2011-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+       Silence various byte-compiler warnings.
+       * emacs-lisp/byte-run.el (make-obsolete-variable): New argument
+       `access-type' and new obsolescence format.
+       * emacs-lisp/bytecomp.el (byte-compile-warn-obsolete): Adjust to
+       new format.
+       (byte-compile-check-variable): New `access-type' argument.
+       Only warn if the access-type is obsolete.
+       (byte-compile-dynamic-variable-bind, byte-compile-variable-ref)
+       (byte-compile-variable-set): Adjust callers.
+       * help-fns.el (describe-variable): Adjust to new obsolescence format.
+       * mail/sendmail.el (mail-mailer-swallows-blank-line): Only mark
+       setting it as obsolete.
+       * simple.el (minibuffer-completing-symbol):
+       * font-lock.el (font-lock-beginning-of-syntax-function): Only mark read
+       access as obsolete.
+       * minibuffer.el (minibuffer-completing-file-name): Don't make it
+       obsolete yet.
+       * international/quail.el (quail-mouse-choose-completion): Remove unused
+       code referring to obsolete var.
+       (quail-choose-completion-string): Remove.
+       * server.el (server-clients-with, server-kill-buffer-query-function)
+       (server-kill-emacs-query-function): Silence "unused `proc'" warnings.
+       * proced.el (proced-send-signal):
+       * emacs-lisp/lisp.el (lisp-complete-symbol):
+       Replace completion-annotate-function with completion-extra-properties.
+ 2011-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * simple.el (goto-line): Use read-number.
+       (overriding-map-is-bound): Remove.
+       (saved-overriding-map): Change default.
+       (save&set-overriding-map): Rename from ensure-overriding-map-is-bound;
+       Take the map as argument.
+       (universal-argument, negative-argument, digit-argument): Use it.
+       (restore-overriding-map): Adjust.
+       (do-auto-fill): Use fill-forward-paragraph.
+       (keyboard-quit): Don't signal an error when debug-on-quit is non-nil.
+       * minibuffer.el (minibuffer-inactive-mode-map): New var.
+       (minibuffer-inactive-mode): New major mode.
+       * mouse.el (mouse-drag-region): Remove the "mouse-1 pops up
+       the *Messages* buffer" hack.
+       (mouse-popup-menubar): Don't burp if the event is a normal key.
+       Miscellaneous tweaks.
+       * emacs-lisp/cl-macs.el (dolist, dotimes): Use the same strategy for
+       lexical scoping as in subr.el's dolist and dotimes.
+       * emacs-lisp/bytecomp.el (byte-compile-unfold-bcf):
+       Silence compiler warning.
+       * thingatpt.el (forward-whitespace): Trivial coding style fix.
+       * subr.el (with-output-to-temp-buffer): Provide an edebug spec.
+       * international/ccl.el (ccl-compile): Trivial simplification.
+       * help-fns.el (help-do-arg-highlight): Silence compiler warning.
+       * emacs-lisp/testcover.el (testcover-end): Remove spurious
+       `printflag' argument.
+       * emacs-lisp/byte-run.el (make-obsolete, make-obsolete-variable):
+       Purecopy the whole obsolescence data.
+ 2011-06-01  Leo Liu  <sdl.web@gmail.com>
+       * net/rcirc.el (rcirc-decode-coding-system): Revert last change;
+       improve doc-string as suggested by Marco Pessotto
+       <melmothx@gmail.com>.
+       (rcirc-print): Fix last change.
  2011-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * minibuffer.el (complete-with-action): Return nil for the metadata and
Simple merge
Simple merge
Simple merge
diff --cc lisp/mouse.el
Simple merge
diff --cc lisp/proced.el
index 2727190bcace0f6694b1ffde5243f90531220312,4436129ce1607300a4f3279684aca71dacd8fd48..a7d4b056e2d8119332ed4f9bf8254d78dbcf8877
@@@ -1725,24 -1725,24 +1725,25 @@@ After sending the signal, this command 
              (setq buffer-read-only t)
              (dolist (process process-alist)
                (insert "  " (cdr process) "\n")))
 -          (save-window-excursion
 -            ;; Analogous to `dired-pop-to-buffer'
 -            ;; Don't split window horizontally.  (Bug#1806)
 -            (let (split-width-threshold)
 -              (pop-to-buffer (current-buffer)))
 -            (fit-window-to-buffer (get-buffer-window) nil 1)
 -            (let* ((completion-ignore-case t)
 -                   (pnum (if (= 1 (length process-alist))
 -                             "1 process"
 -                           (format "%d processes" (length process-alist))))
 -                   (completion-extra-properties
 -                    '(:annotation-function
 -                      (lambda (s) (cdr (assoc s proced-signal-list))))))
 -              (setq signal
 -                    (completing-read (concat "Send signal [" pnum
 -                                             "] (default TERM): ")
 -                                     proced-signal-list
 -                                     nil nil nil nil "TERM")))))))
 +        ;; Don't split window horizontally.  (Bug#1806) We now do
 +        ;; split windows horizontally again - override this via
 +        ;; `display-buffer-alist' if you want to.
 +          (let* ((window (display-buffer nil nil 'proced-send-signal))
 +               (completion-ignore-case t)
 +               (pnum (if (= 1 (length process-alist))
 +                         "1 process"
 +                       (format "%d processes" (length process-alist))))
-                (completion-annotate-function
-                 (lambda (s) (cdr (assoc s proced-signal-list)))))
++               (completion-extra-properties
++                '(:annotation-function
++                  (lambda (s) (cdr (assoc s proced-signal-list))))))
 +            (fit-window-to-buffer window nil 1)
 +          (select-window window t)
 +          (setq signal
 +                (completing-read (concat "Send signal [" pnum
 +                                         "] (default TERM): ")
 +                                 proced-signal-list
 +                                 nil nil nil nil "TERM"))
 +          (quit-restore-window window)))))
      ;; send signal
      (let ((count 0)
            failures)
diff --cc lisp/shell.el
Simple merge
diff --cc lisp/simple.el
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/minibuf.c
Simple merge
diff --cc src/xdisp.c
Simple merge