]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Tue, 11 Jan 2011 16:05:26 +0000 (17:05 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Tue, 11 Jan 2011 16:05:26 +0000 (17:05 +0100)
1  2 
doc/lispref/ChangeLog
lisp/ChangeLog
lisp/cus-edit.el
src/ChangeLog

index 2a7726f7d49c1e8a9f3a372fbacc20ebd625f9d0,6a51b3f506b528aff1dcb3c7ae24f4b8204f8a52..f7cfe2b94ce768290d17bf47c98a64f27ae8294b
@@@ -1,30 -1,7 +1,34 @@@
+ 2011-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * loading.texi (Hooks for Loading): Adjust doc of eval-after-load.
 +2011-01-09  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Switching Buffers): Emphasize distinction of
 +      switch-to-buffer and pop-to-buffer function families.  Fix
 +      argument description for these functions.
 +
 +2011-01-08  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Windows): Rename sections "Frames and Windows"
 +      to "Windows and Frames", "Compound Windows" to "Atomic Windows",
 +      and "Window Groups" to "Side Windows".
 +      (Splitting Windows, Deleting Windows): Rewrite sections dealing
 +      with window parameters and ignore-window-parameters.  Describe
 +      handling of atomic windows and side windows.
 +      (Displaying Buffers): Describe method and other new display
 +      specifiers, display-buffer-alist, and the new functions
 +      display-buffer-reuse-window, display-buffer-pop-up-window,
 +      display-buffer-pop-up-frame, and display-buffer-in-side-window.
 +      Add description of specifier normalization
 +      (Window Parameters): Describe functions windows-with-parameter
 +      and window-with-parameter and the window parameters used by the
 +      window handling routines.
 +      (Composite Windows, Compound Windows, Window Groups): Sections
 +      removed.
 +      (Atomic Windows): New section on atomic windows.
 +      (Side Windows): New section on side windows.
 +
  2011-01-02  Eli Zaretskii  <eliz@gnu.org>
  
        * modes.texi (Emulating Mode Line): Fix last change.
diff --cc lisp/ChangeLog
index de6afa110572f7c20f37066610f9e50ef3f713c9,71bf97b099734608f57cc62dd37830951a6643fc..9ba851ae0fbbbe21526d049f1bf94c8f078ab2ec
 +2011-01-11  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * buff-menu.el (Buffer-menu-mode-map): Bind "q" to
 +      quit-restore-window.
 +      (buffer-menu): Call pop-to-buffer-same-window.
 +      (buffer-menu-other-window): Call pop-to-buffer-other-window.
 +      (Buffer-menu-select): Rewrite using display-buffer-same-window
 +      and display-buffer.
 +      (Buffer-menu-1-window, Buffer-menu-mouse-select)
 +      (Buffer-menu-this-window): Call pop-to-buffer-same-window.
 +      (Buffer-menu-other-window): Call pop-to-buffer-other-window.
 +      (Buffer-menu-switch-other-window): Call
 +      display-buffer-same-frame-other-window.
 +      (Buffer-menu-2-window): Add label argument in calls of
 +      display-buffer-same-window and
 +      pop-to-buffer-same-frame-other-window.
 +
 +      * mail/reporter.el (reporter-submit-bug-report): Use
 +      display-buffer-same-frame-other-window.
 +
 +      * progmodes/compile.el (compilation-find-file): Use
 +      display-buffer-same-frame.
 +
 +      * progmodes/inf-lisp.el (switch-to-lisp): Rewrite with new buffer
 +      display method specifiers.
 +
 +      * vc/ediff-ptch.el (ediff-get-patch-buffer): Use
 +      pop-to-buffer-other-window.
 +      (ediff-patch-file-internal): Replace switch-to-buffer by
 +      pop-to-buffer-same-window and switch-to-buffer-other-window by
 +      pop-to-buffer-other-window.
 +
 +      * vc/pcvs.el (cvs-ediff-exit-hook): Call
 +      pop-to-buffer-same-window instead of switch-to-buffer.
 +      (cvs-mode-find-file): Replace switch-to-buffer and
 +      switch-to-buffer-other-window by pop-to-buffer-same-window and
 +      pop-to-buffer-other-window.  Replace call to dired-other-window
 +      by call to display-buffer-other-window.
 +      (cvs-temp-buffer): Call display-buffer-other-window instead of
 +      display-buffer.
 +
 +      * vc/pcvs-util.el (cvs-bury-buffer): Call quit-restore-window.
 +
+ 2011-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/prolog.el: Fix up coding convention and such.
+       (prolog-indent-width): Use the same default as in
+       previous prolog.el rather than tab-width which depends on which buffer
+       is current when the file is loaded.
+       (prolog-electric-newline-flag): Only enable if electric-indent-mode
+       is not available.
+       (prolog-emacs): Remove.  Use (featurep 'xemacs) instead.
+       (prolog-known-systems): Remove.
+       (prolog-mode-syntax-table, prolog-inferior-mode-map):
+       Move initialization into declaration.
+       (prolog-mode-map): Move initialization into declaration.
+       Remove system-specific mode-map vars, since they referred to the same
+       keymap anyway.
+       (prolog-mode-variables): Obey the user's preference w.r.t
+       adaptive-fill-mode.  Prefer symbol-value to `eval'.
+       (prolog-mode-keybindings-edit): Add compatibility bindings.
+       (prolog-mode): Use define-derived-mode.  Don't handle mercury here.
+       (mercury-mode-map): New var.
+       (mercury-mode, prolog-inferior-mode): Use define-derived-mode.
+       (prolog-ensure-process, prolog-process-insert-string)
+       (prolog-consult-compile): Use with-current-buffer.
+       (prolog-guess-fill-prefix): Simplify data flow.
+       (prolog-replace-in-string): New function to use instead of
+       replace-in-string.
+       (prolog-enable-sicstus-sd): Don't abuse `eval'.
+       (prolog-uncomment-region): Use `uncomment-region' when available.
+       (prolog-electric-colon, prolog-electric-dash): Use `eolp'.
+       (prolog-int-to-char, prolog-char-to-int): New functions to use instead
+       of int-to-char and char-to-int.
+       (prolog-mode-hook, prolog-inferior-mode-hook): Don't force font-lock.
+ 2011-01-11  Stefan Bruda  <stefan@bruda.ca>
+       * progmodes/prolog.el: Replace by a whole new file.
+ 2011-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * subr.el (eval-after-load): Fix timing for features (bug#7769).
+       (declare-function, undefined, insert-for-yank)
+       (replace-regexp-in-string): Follow checkdoc's recommendations.
+ 2011-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * calendar/diary-lib.el (diary-mode): Refresh *Calendar* after
+       refreshing the diary buffer.
+ 2011-01-10  Ken Manheimer  <ken.manheimer@gmail.com>
+       * allout.el: Add 2011 to the file copyright.
+       (allout-encrypt-string): Prevent encryption from adding an extra
+       newline at the end of the topic body.
+       (allout-version): Increment to 2.3.
+ 2011-01-10  Michael Albinus  <michael.albinus@gmx.de>
+       * net/dbus.el (dbus-unregister-service): Complete doc.
+       Fix call of dbus-error signal.
+       (dbus-register-property): Use `dont-register' keyword.
+ 2011-01-10  Jan Moringen  <jan.moringen@uni-bielefeld.de>
+       * net/dbus.el (dbus-unregister-service): Translate returned
+       integer into a symbol.
+       (dbus-register-property): Use `dbus-register-service' to do the
+       name registration.
 +2011-01-09  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * dired.el (dired-pop-to-buffer): Call
 +      pop-to-buffer-same-frame-other-window.
+ 2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
+       * progmodes/idlw-help.el (idlwave-help-link): Inherit from link face.
+       Suggested by Joakim Verona.
+       * comint.el (comint-highlight-prompt): Inherit minibuffer-prompt.
+       * wid-edit.el (visibility): Replace :on-image and :off-image
+       widget properties with :on-glyph and :off-glyph, for consistency
+       with the `visibility' widget.
+       (widget-toggle-value-create, widget-visibility-value-create):
+       Merge into a single function `widget-toggle-value-create'.
+       * cus-edit.el (custom-variable-value-create, custom-visibility)
+       (custom-face-edit-value-create, custom-face-value-create):
+       Replace :on-image and :off-image widget properties with :on-glyph and
+       :off-glyph, for consistency with the `visibility' widget.
+ 2011-01-09  Andreas Schwab  <schwab@linux-m68k.org>
+       * net/ldap.el (ldap-search-internal): Don't use eval.
  
  2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
  
Simple merge
diff --cc src/ChangeLog
Simple merge