]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Fri, 19 Nov 2010 16:29:01 +0000 (17:29 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Fri, 19 Nov 2010 16:29:01 +0000 (17:29 +0100)
14 files changed:
1  2 
doc/lispref/ChangeLog
lisp/ChangeLog
lisp/calendar/calendar.el
lisp/electric.el
lisp/files.el
lisp/gnus/ChangeLog
lisp/minibuffer.el
lisp/printing.el
lisp/progmodes/python.el
lisp/simple.el
lisp/speedbar.el
src/ChangeLog
src/minibuf.c
src/xdisp.c

index 6edf8543d053efcb4a2d9483511681c0f5549ec1,8f57bc45da57b8e4e789a4d29b13f340878fa005..f62ffb0d0ef54f251f6f1f7c392f6dc861fec0a7
@@@ -1,15 -1,14 +1,26 @@@
 +2010-11-19  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Displaying Buffers): Document
 +      display-buffer-function revival and the -same-frame,
 +      -other-window-same-frame postfixed functions.
 +
+ 2010-11-17  Eli Zaretskii  <eliz@gnu.org>
+       * customize.texi (Composite Types): Lower-case index entry.
+       * loading.texi (How Programs Do Loading): Document
+       load-file-name.  (Bug#7346)
+ 2010-11-17  Glenn Morris  <rgm@gnu.org>
+       * text.texi (Kill Functions, Low-Level Kill Ring): Small fixes.
 +2010-11-16  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Displaying Buffers): Mention that if a window is
 +      the only window on its frame it can be split regardless of the
 +      min-height specifier.
 +
  2010-11-13  Eli Zaretskii  <eliz@gnu.org>
  
        * display.texi (Usual Display): Characters with no fonts are not
diff --cc lisp/ChangeLog
index 2995108185247d74c468bbd3799fe17abeb2046a,be4a885a6662a407b9fcbf7b838a537f6f6921ef..240bf04b10fe96f04522916f60b88d4bd6381222
 +2010-11-19  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-same-frame-specifiers)
 +      (display-buffer-other-window-same-frame-specifiers): New
 +      constants.
 +      (display-buffer): Call display-buffer-function if it's non-nil.
 +      (display-buffer-same-window, display-buffer-other-window)
 +      (pop-to-buffer-other-window, switch-to-buffer-other-window):
 +      Adjust doc-strings.
 +      (display-buffer-same-frame)
 +      (display-buffer-other-window-same-frame)
 +      (pop-to-buffer-same-frame)
 +      (pop-to-buffer-other-window-same-frame)
 +      (switch-to-buffer-same-frame)
 +      (switch-to-buffer-other-window-same-frame): New functions.
 +      (display-buffer-function): Un-obsolete.
 +
 +      * bookmark.el (bookmark-bmenu-2-window): Use
 +      pop-to-buffer-other-window.
 +      (bookmark-bmenu-switch-other-window): Use
 +      display-buffer-other-window.
 +
 +      * progmodes/etags.el (find-tag-other-window): New argument
 +      other-frame. Call either pop-to-buffer-other-window or
 +      pop-to-buffer-other-frame.
 +      (find-tag-other-frame): Call find-tag-other-window with
 +      other-frame argument t.
 +
 +      * speedbar.el (speedbar-find-file-in-frame)
 +      (speedbar-buffer-click): Use pop-to-buffer-other-frame.
 +
 +      * term/ns-win.el (ns-find-file): Use pop-to-buffer-other-frame.
 +
+ 2010-11-19  Tassilo Horn  <tassilo@member.fsf.org>
+       * textmodes/reftex-ref.el (reftex-goto-label): If point is inside
+       a \ref{} or \pageref{} macro, then use its value as initial input.
+ 2010-11-19  Jay Belanger  <jay.p.belanger@gmail.com>
+       * calc/calc-units.el (math-build-units-table-buffer):
+       calc/README: Mention that the TeX specific units won't use the
+       `tex' prefix in TeX mode.
+       calc/calc-lang.el (math-variable-table): Don't use the `tex'
+       prefix for units in TeX mode.
+ 2010-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * simple.el (kill-new, kill-append, kill-region):
+       * comint.el (comint-kill-region): Make the yank-handler argument obsolete.
+ 2010-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/smie.el (smie-bnf-classify): Signal errors for tokens
+       that are both openers (resp. closers) and something else.
+       (smie-grammar): Loosen definition of valid values.
+       (smie-next-sexp, smie-down-list, smie-blink-matching-open)
+       (smie-indent--parent, smie-rule-parent, smie-indent-keyword)
+       (smie-indent-after-keyword): Adjust users.
+       (smie-indent-keyword): Don't indent empty lines.
+       * vc-hg.el (vc-hg-program): New var.
+       Suggested by Norman Gray <norman@astro.gla.ac.uk>.
+       (vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it.
+ 2010-11-18  Glenn Morris  <rgm@gnu.org>
+       * emacs-lisp/autoload.el (autoload-find-destination): The function
+       coding-system-eol-type may return non-numeric values.  (Bug#7414)
+ 2010-11-18  Ulrich Mueller  <ulm@gentoo.org>
+       * server.el (server-force-stop): Ensure the server is stopped (Bug#7409).
+ 2010-11-18  Eli Zaretskii  <eliz@gnu.org>
+       * subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)
+ 2010-11-18  Chong Yidong  <cyd@stupidchicken.com>
+       * textmodes/picture.el (picture-mouse-set-point): Don't use
+       posn-col-row; explicitly compute the motion based on the posn at
+       the window-start (Bug#7390).
+ 2010-11-18  Glenn Morris  <rgm@gnu.org>
+       * novice.el (disabled-command-function):
+       Fix 2009-11-15 change.  (Bug#7384)
+ 2010-11-18  Glenn Morris  <rgm@gnu.org>
+       * calendar/calendar.el (diary-iso-date-forms): Make elements
+       mutually exclusive.  (Bug#7377)
+ 2010-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/smie.el (smie-prec2->grammar): Obey equality constraints
+       when filling the remaining "unconstrained" values.
+ 2010-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/bytecomp.el (byte-compile-warnings): Simplify the
+       safety predicate.
+       * files.el (safe-local-variable-p): Gracefully handle errors.
+       * emacs-lisp/smie.el (smie-rule-parent, smie-indent--rule):
+       Use smie-indent-virtual when indenting relative to an opener.
+       (smie-rule-separator): Use smie-rule-parent.
+       (smie-indent-keyword): Consult rules, even for openers at bol.
+       (smie-indent-comment-close): Try to align closer's content.
+ 2010-11-18  Glenn Morris  <rgm@gnu.org>
+       * ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.
+ 2010-11-18  Glenn Morris  <rgm@gnu.org>
+       * printing.el (pr-menu-bind): Doc fix.
+       * speedbar.el (speedbar-toggle-images): Doc fix.
+       * progmodes/python.el (python-shell): Doc fix.
+       * wid-edit.el (widget-field-use-before-change)
+       (widget-use-overlay-change): Doc fixes.
+ 2010-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+       Minor cleanup to improve style.
+       * textmodes/rst.el (rst-update-section): Use point-marker.
+       (rst-get-decoration): Eliminate unneeded assignment.
+       (rst-promote-region, rst-straighten-decorations)
+       (rst-section-tree, rst-adjust): Use point-marker.
+       (rst-toc-mode-mouse-goto): Avoid setq.
+       (rst-shift-region-guts, rst-shift-region-left)
+       (rst-iterate-leftmost-paragraphs, rst-iterate-leftmost-paragraphs-2)
+       (rst-convert-bullets-to-enumeration): Use copy-marker.
+       * minibuffer.el (completion-fail-discreetly): New var.
+       (completion--do-completion): Use it.
+       * electric.el (electric-pair-pairs): New var.
+       (electric-pair-post-self-insert-function): Use it.
+       (electric-layout-post-self-insert-function): Don't insert a before
+       newline unless it's actually needed.
 +2010-11-17  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-split-window-1): Fix sizing for
 +      internal windows which got broken by the last fix.
 +
 +      * progmodes/compile.el (compilation-minor-mode-map)
 +      (compilation-mode-map): Replace bindings for quit-window by
 +      bindings for quit-restore-window.
 +
+ 2010-11-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/python.el (run-python): Explain why we remove the current
+       directory from sys.path.  Suggested by Eric Hanchrow <erich@cozi.com>.
+       * progmodes/grep.el (grep-regexp-alist): Tighten the regexp (bug#7378).
 +2010-11-16  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-split-window-1)
 +      (display-buffer-split-window): Rewrite so that windows are
 +      always split evenly.
 +
  2010-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * progmodes/octave-mod.el: Rely on elecric-*-modes.
Simple merge
Simple merge
diff --cc lisp/files.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/minibuf.c
Simple merge
diff --cc src/xdisp.c
Simple merge