]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Sat, 30 Oct 2010 09:38:26 +0000 (11:38 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Sat, 30 Oct 2010 09:38:26 +0000 (11:38 +0200)
1  2 
lisp/ChangeLog
lisp/cus-start.el
lisp/files.el
lisp/simple.el
src/ChangeLog
src/buffer.c
src/frame.c
src/w32fns.c
src/xfns.c

diff --cc lisp/ChangeLog
index e9db6c328d3ac3625372dc5c0207340c0d38e389,5344909c3a5a932124d4771635b03f8f67848519..c95f015c127c336ab78e01fd3032454a5f9d5b44
@@@ -1,23 -1,72 +1,92 @@@
+ 2010-10-30  Glenn Morris  <rgm@gnu.org>
+       * cus-start.el: Add :set properties for minor modes menu-bar-mode,
+       tool-bar-mode, transient-mark-mode.  (Bug#7306)
+       Include the :set property in the dumped Emacs.
 +2010-10-30  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (window-deletable-p, quit-restore-window): Adapt to
 +      new quit-restore semantics.
 +      (split-window-quit-restore): Remove.
 +      (split-window-vertically, split-window-horizontally):
 +      Unconditionally copy quit-restore parameter to new window.
 +      (display-buffer-names): Mention quit-restore window parameter.
 +      (display-buffer-window-and-buffer): Rename to
 +      display-buffer-window and rewrite doc-string.
 +      (display-buffer-in-window, display-buffer-in-lru-buffer-window)
 +      (display-buffer-in-lru-window, display-buffer-in-new-window)
 +      (display-buffer-in-new-frame, display-buffer): Move quit-restore
 +      parameter handling from display-buffer-in-window to the callers.
 +      Set display-buffer-window.
 +
 +      * help.el (help-window-setup, with-help-window): Use
 +      display-buffer-window insted of display-buffer-window-and-buffer
 +      and adapt to new semantics of the former.
 +
+ 2010-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+       SMIE: change indent rules format, improve smie-setup.
+       * emacs-lisp/smie.el (smie-precs-precedence-table)
+       (smie-merge-prec2s, smie-bnf-precedence-table, smie-prec2-levels):
+       Mark them pure so the tables gets built at compile time.
+       (smie-bnf-precedence-table): Store the closer-alist in the table.
+       (smie-prec2-levels): Preserve the closer-alist.
+       (smie-blink-matching-open): Be more forgiving in case of indentation.
+       (smie-hanging-p): Rename from smie-indent--hanging-p.
+       (smie-bolp): Rename from smie-indent--bolp.
+       (smie--parent, smie--after): New dynamic vars.
+       (smie-parent-p, smie-next-p, smie-prev-p): New funs.
+       (smie-indent-rules): Remove.
+       (smie-indent--offset-rule): Remove fun.
+       (smie-rules-function): New var.
+       (smie-indent--rule): New fun.
+       (smie-indent--offset, smie-indent-keyword, smie-indent-after-keyword)
+       (smie-indent-exps): Use it.
+       (smie-setup): Setup paren blinking; add keyword args for token
+       functions; extract closer-alist from op-levels.
+       (smie-indent-debug-log): Remove var.
+       (smie-indent-debug): Remove fun.
+       * progmodes/prolog.el (prolog-smie-indent-rules): Remove.
+       (prolog-smie-rules): New fun to replace it.
+       (prolog-mode-variables): Simplify.
+       * progmodes/octave-mod.el (octave-smie-closer-alist): Remove, now that
+       it's setup automatically.
+       (octave-smie-indent-rules): Remove.
+       (octave-smie-rules): New fun to replace it.
+       (octave-mode): Simplify.
+ 2010-10-29  Glenn Morris  <rgm@gnu.org>
+       * files.el (temporary-file-directory): Remove (already defined in C).
+       * cus-start.el: Add temporary-file-directory.
+       * abbrev.el (abbrev-mode):
+       * composite.el (auto-composition-mode):
+       * menu-bar.el (menu-bar-mode):
+       * simple.el (transient-mark-mode):
+       * tool-bar.el (tool-bar-mode): Adjust the define-minor-mode calls so
+       that they do not define the associated variables twice.
+       * simple.el (transient-mark-mode): Remove defvar.
+       * composite.el (auto-composition-mode): Make variable auto-buffer-local.
+       * cus-start.el: Add transient-mark-mode, menu-bar-mode, tool-bar-mode.
+       Handle multiple groups, and also custom-delayed-init-variables.
+       * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
+ 2010-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/pcase.el (pcase): New `string' and `guard' patterns.
+       (pcase-if): Add one minor optimization.
+       (pcase-split-equal): Rename from pcase-split-eq.
+       (pcase-split-member): Rename from pcase-split-memq.
+       (pcase-u1): Add strings to the member optimization.
+       Add `guard' variant of predicates.
+       (pcase-q1): Add string patterns.
+ 2010-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * vc/log-edit.el (log-edit-rewrite-fixes): State its safety pred.
  2010-10-28  Glenn Morris  <rgm@gnu.org>
  
        * term/ns-win.el (global-map, menu-bar-final-items, menu-bar-help-menu):
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/xfns.c
Simple merge