]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Fri, 5 Nov 2010 07:23:30 +0000 (08:23 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Fri, 5 Nov 2010 07:23:30 +0000 (08:23 +0100)
1  2 
lisp/ChangeLog
lisp/vc/ediff-util.el
src/ChangeLog

diff --cc lisp/ChangeLog
index cc6aa6d10ab43be64232ed49c5d1b097d8ef3935,634f73c3cc5c633a3e75bd13c39eff02735cf0f6..a225bcbd1654109656622d9772328919e30b705e
 +2010-11-04  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-names, display-buffer-regexps): Make
 +      even-window-sizes a seperate specifier.  Allow numbers and
 +      functions in the cdr of the adjust-height specifier and remove
 +      even-window-heights and the special handling of
 +      fit-window-to-buffer and shrink-window-if-larger-than-buffer.
 +      Add new specifier adjust-width similar to adjust-height.
 +      (display-buffer-normalize-specifiers-1): Fix typo.
 +      (display-buffer-even-sizes, display-buffer-adjust-height)
 +      (display-buffer-adjust-width): New functions to handle size
 +      adjustment of new window.
 +      (display-buffer-adjust-heights): Remove.
 +      (display-buffer-in-window): Don't call
 +      display-buffer-adjust-heights any more.
 +      (display-buffer-in-lru-buffer-window)
 +      (display-buffer-in-lru-window): Call display-buffer-even-sizes.
 +      (display-buffer-in-new-window): Use functionp instead of
 +      fboundp.  Call display-buffer-adjust-height and
 +      display-buffer-adjust-width.
 +      (display-buffer): Use functionp instead of fboundp.
 +      (fit-window-to-buffer): Rename argument IGNORE to OVERRIDE.
 +
 +      * progmodes/compile.el (compilation-start)
 +      (compilation-goto-locus): Use adjust-height specifier in
 +      display-buffer calls.
 +
 +      * buff-menu.el (Buffer-menu-switch-other-window)
 +      (Buffer-menu-2-window): Use buffer display specifiers.
 +
 +      * cus-edit.el (top-level): Remove autoloaded add-hook for
 +      same-window-regexps.
 +      (customize-group, customize-face): New optional argument
 +      OTHER-WINDOW.  Use buffer display specifiers.  Call
 +      custom-buffer-create with OTHER-WINDOW argument t.
 +      (customize-group-other-window): Call customize-group with
 +      OTHER-WINDOW argument t.
 +      (customize-face-other-window): Call customize-face with
 +      OTHER-WINDOW argument t.
 +      (custom-buffer-create): New optional argument OTHER-WINDOW.
 +      (custom-buffer-create-other-window): Call
 +      pop-to-buffer-other-window.
 +      (customize-browse): Call pop-to-buffer-same-window.
 +
 +      * play/decipher.el (decipher-display-range): Use
 +      pop-to-buffer-other-window.
 +      (decipher-display-stats-buffer): Use
 +      display-buffer-other-window.
 +
 +      * vc/ediff-util.el (ediff-clone-buffer-for-region-comparison):
 +      Use pop-to-buffer-other-window.
 +
 +      * ehelp.el (with-electric-help): Use pop-to-buffer-other-window.
 +
+ 2010-11-03  Chong Yidong  <cyd@stupidchicken.com>
+       * emacs-lisp/package.el (package-unpack): Remove no-op.
+       (package--builtins, package--dir): Doc fix.
+       (package-activate-1, package-activate, package-install)
+       (package-compute-transaction): Fix error message.
+       (package-delete): Use delete-directory.  Omit system packages.
+       (package-initialize): Set package-alist to nil first.
+       (package-menu-mark-delete, package-menu-mark-install): Don't add
+       symbols that are inconsistent with the package state.
+       (package-menu-execute): Perform deletions and installations as
+       single batch operations.
+ 2010-11-03  Glenn Morris  <rgm@gnu.org>
+       * progmodes/idlwave.el (idlwave-pset): Only used on XEmacs.
+       (props): Remove unnecessary declaration.
+       * textmodes/ispell.el (ispell-init-process): On Emacs, always use
+       set-process-query-on-exit-flag.
+       * textmodes/reftex-toc.el (name1, dummy, dummy2): Remove unused decs.
+       (reftex-toc-do-promote): Remove unused local `mpos'.
+       (reftex-toc-restore-region): Make `mpos' local to this function.
+       * net/dbus.el (dbus-name-owner-changed-handler): Doc fix.
+       * play/landmark.el (lm-losing-threshold): Correct spelling.
+       (lm-human-plays): Use new name.
+       * play/gomoku.el (gomoku-loosing-threshold): Correct spelling.
+       (gomoku-human-plays): Use new name.
+       * play/gomoku.el (nil-score, Xscore, XXscore, XXXscore, XXXXscore)
+       (Oscore, OOscore, OOOscore, OOOOscore): Rename with gomoku- prefix.
+       (gomoku-score-trans-table, gomoku-winning-threshold)
+       (gomoku-loosing-threshold, gomoku-init-score-table): Use new names.
+ 2010-11-03  Chong Yidong  <cyd@stupidchicken.com>
+       * emacs-lisp/package.el: Don't put built-in packages in
+       package-alist, to avoid loading inefficiencies.
+       (package-built-in-p): Make VERSION optional, and treat it as a
+       minimum acceptable version.
+       (package-activate): Search separately for built-in packages.  Emit
+       a warning if a dependency fails.
+       (define-package): Handle most common case, where there is no
+       obsolete package, first.
+       (package-compute-transaction): Print required version in error.
+       (package--initialized): New variable.
+       (list-packages): Use it.
+       (package-initialize): Optional arg NO-ACTIVATE.  Don't put
+       built-in packages in packages-alist; keep it separate.  Set
+       package--initialized.
+       (describe-package): Avoid activating packages as a side-effect.
+       Search separately for built-in packages.
+       (describe-package-1): Handle the case where an elpa package is
+       simultaneously built-in and available/installed.
+       (package-installed-p, package--generate-package-list): Search
+       separately for built-in packages.
+       (package-load-descriptor): Doc fix.
+ 2010-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/perl-mode.el (perl-syntax-propertize-function):
+       Handle __DATA__ and __END__.
 +2010-11-02  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-names): Describe `not-this-window' and
 +      `not-this-frame' specifiers in doc-string.
 +      (display-buffer-in-lru-buffer-window)
 +      (display-buffer-in-lru-window, display-buffer-in-new-window):
 +      Handle `not-this-window' and `not-this-frame' specifiers when
 +      their cdr specifies a window or a frame.
 +      (display-buffer): Explain in doc-string that the cdr of the
 +      `not-this-window' and `not-this-frame' specifiers argument can
 +      name a window.
 +
 +      * progmodes/compile.el (compilation-start): When displaying outbuf
 +      directly pass height parameters.
 +      (compilation-goto-locus): Use specifiers in display-buffer and
 +      pop-to-buffer calls.  Simplify.
 +      (compilation-find-file): Use specifiers in display-buffer calls.
 +
+ 2010-11-02  Noah Friedman  <friedman@splode.com>
+       * emacs-lisp/bytecomp.el (byte-recompile-file): If bytecomp-arg is
+       nil, do not ask to recompile files that are not already compiled,
+       and do not recompile them.
  2010-11-02  Chong Yidong  <cyd@stupidchicken.com>
  
        * emacs-lisp/package.el (package-initialize): Ensure that
        * mouse.el (mouse-drag-track): Call mouse-start-end to handle
        word/line selection (Bug#6565).
  
 +2010-07-04  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (get-mru-window): New function.
++
  2010-07-04  Juanma Barranquero  <lekktu@gmail.com>
  
        * net/dbus.el (dbus-send-signal): Declare function.
Simple merge
diff --cc src/ChangeLog
Simple merge