[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102166: Merge changes from emacs-23
|
From: |
Chong Yidong |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102166: Merge changes from emacs-23 branch |
|
Date: |
Sun, 31 Oct 2010 10:41:32 -0400 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102166 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 10:41:32 -0400
message:
Merge changes from emacs-23 branch
modified:
doc/lispref/ChangeLog
doc/lispref/maps.texi
doc/misc/ChangeLog
doc/misc/cc-mode.texi
doc/misc/mh-e.texi
etc/MH-E-NEWS
lisp/ChangeLog
lisp/cedet/ChangeLog
lisp/cedet/mode-local.el
lisp/cedet/semantic/analyze/debug.el
lisp/cedet/semantic/symref/list.el
lisp/menu-bar.el
lisp/net/tramp.el
lisp/play/fortune.el
lisp/play/gomoku.el
lisp/play/landmark.el
lisp/progmodes/sql.el
lisp/select.el
lisp/speedbar.el
lisp/textmodes/bibtex.el
lisp/vc/add-log.el
src/ChangeLog
src/dbusbind.c
src/xterm.c
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2010-10-28 07:21:43 +0000
+++ b/doc/lispref/ChangeLog 2010-10-31 14:40:01 +0000
@@ -1,3 +1,7 @@
+2010-10-31 Glenn Morris <address@hidden>
+
+ * maps.texi (Standard Keymaps): Update File menu description.
+
2010-10-28 Glenn Morris <address@hidden>
* Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir.
=== modified file 'doc/lispref/maps.texi'
--- a/doc/lispref/maps.texi 2010-05-03 22:01:23 +0000
+++ b/doc/lispref/maps.texi 2010-10-27 04:06:52 +0000
@@ -1,7 +1,8 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
address@hidden 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
Inc.
address@hidden 2005, 2006, 2007, 2008, 2009, 2010
address@hidden Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/maps
@node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
@@ -183,9 +184,9 @@
@vindex menu-bar-edit-menu
The keymap which displays the Edit menu in the menu bar.
address@hidden menu-bar-files-menu
address@hidden menu-bar-files-menu
-The keymap which displays the Files menu in the menu bar.
address@hidden menu-bar-file-menu
address@hidden menu-bar-file-menu
+The keymap which displays the File menu in the menu bar.
@item menu-bar-help-menu
@vindex menu-bar-help-menu
@@ -239,6 +240,3 @@
A full keymap used by View mode.
@end table
address@hidden
- arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9
address@hidden ignore
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2010-10-30 05:59:34 +0000
+++ b/doc/misc/ChangeLog 2010-10-31 14:40:01 +0000
@@ -1,3 +1,11 @@
+2010-10-31 Glenn Morris <address@hidden>
+
+ * mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense.
+
+2010-10-31 Glenn Morris <address@hidden>
+
+ * cc-mode.texi: Remove reference to defunct viewcvs URL.
+
2010-10-29 Lars Magne Ingebrigtsen <address@hidden>
* gnus.texi (Client-Side IMAP Splitting): Mention
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2010-08-01 18:07:10 +0000
+++ b/doc/misc/cc-mode.texi 2010-10-31 14:40:01 +0000
@@ -160,7 +160,8 @@
This manual is for CC Mode in Emacs.
Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -201,9 +202,8 @@
@vskip 0pt plus 1filll
@insertcopying
-This manual was generated from cc-mode.texi, which can be downloaded
-from
address@hidden://cvs.savannah.gnu.org/viewcvs/emacs/emacs/doc/misc/cc-mode.texi}.
+This manual was generated from cc-mode.texi, which is distributed with Emacs,
+or can be downloaded from @url{http://savannah.gnu.org/projects/emacs/}.
@end titlepage
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -7015,6 +7015,3 @@
@bye
address@hidden
- arch-tag: c4cab162-5e57-4366-bdce-4a9db2fc97f0
address@hidden ignore
=== modified file 'doc/misc/mh-e.texi'
--- a/doc/misc/mh-e.texi 2010-06-23 02:57:26 +0000
+++ b/doc/misc/mh-e.texi 2010-10-30 21:17:59 +0000
@@ -213,7 +213,7 @@
them.
The MH-E package is distributed with GNU address@hidden
address@hidden of MH-E will appear in GNU Emacs 23.1. It is supported
address@hidden of MH-E appeared in GNU Emacs 23.1. It is supported
in GNU Emacs 21 and 22, as well as XEmacs 21 (except for versions
21.5.9-21.5.16). It is compatible with MH versions 6.8.4 and higher,
all versions of nmh, and GNU mailutils 1.0 and higher.}, so you
@@ -8951,8 +8951,8 @@
reorganized to push back two decades of entropy. Version 8 appeared in
Emacs 22.1 in 2006.
-Development was then quiet for a couple of years. Emacs 23.1, which is
-due out in 2009, will contain version 8.1. This version includes a few
+Development was then quiet for a couple of years. Emacs 23.1, released
+in June 2009, contains version 8.2. This version includes a few
new features and several bug fixes.
Bill Wohler, August 2008
@@ -9061,6 +9061,4 @@
@c sentence-end-double-space: nil
@c End:
address@hidden
- arch-tag: b778477d-1a10-4a99-84de-f877a2ea6bef
address@hidden ignore
+
=== modified file 'etc/MH-E-NEWS'
--- a/etc/MH-E-NEWS 2010-01-13 08:35:10 +0000
+++ b/etc/MH-E-NEWS 2010-10-30 21:17:59 +0000
@@ -1,13 +1,13 @@
* COPYRIGHT
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+ 2010 Free Software Foundation, Inc.
See the end of the file for license conditions.
* Changes in MH-E 8.2
-Version 8.2 of MH-E will appear in GNU Emacs 23.1. This is a small
+Version 8.2 of MH-E appeared in GNU Emacs 23.1. This is a small
release that includes internal changes from the Emacs team. A new
hook, `mh-pack-folder-hook', has been added.
@@ -231,7 +231,7 @@
If you want to see the release notes for the alpha and beta releases
leading up this release, please see:
-
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/MH-E-NEWS?rev=1.25&root=emacs&view=markup
+
http://cvs.savannah.gnu.org/viewvc/emacs/emacs/etc/MH-E-NEWS?revision=1.25&view=markup
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-31 11:54:02 +0000
+++ b/lisp/ChangeLog 2010-10-31 14:40:01 +0000
@@ -1,3 +1,36 @@
+2010-10-31 Michael Albinus <address@hidden>
+
+ * net/tramp.el (tramp-handle-insert-file-contents): For root,
+ preserve owner and group when editing files. (Bug#7289)
+
+2010-10-31 Stefan Monnier <address@hidden>
+
+ * speedbar.el (speedbar-mode):
+ * play/fortune.el (fortune-in-buffer, fortune):
+ * play/gomoku.el (gomoku-mode):
+ * play/landmark.el (lm-mode):
+ * textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally):
+ Replace inappropriate uses of toggle-read-only. (Bug#7292)
+
+2010-10-31 Glenn Morris <address@hidden>
+
+ * select.el (x-selection): Mark it as an obsolete alias.
+
+2010-10-31 Aaron S. Hawley <address@hidden>
+
+ * add-log.el (find-change-log): Use derived-mode-p rather than
+ major-mode (bug#7284).
+
+2010-10-31 Glenn Morris <address@hidden>
+
+ * menu-bar.el (menu-bar-files-menu): Make it into an actual alias,
+ rather than just an unused variable that inherits from the real one.
+
+2010-10-31 Glenn Morris <address@hidden>
+
+ * comint.el (comint-password-prompt-regexp):
+ Match "enter the password". (Bug#7224)
+
2010-10-31 Alan Mackenzie <address@hidden>
* progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.
@@ -246,13 +279,13 @@
auto-built for efficiency of execution and updating.
(verilog-extended-complete-re): Support 'pure' fucntion & task
declarations (these have no bodies).
- (verilog-beg-of-statement): general cleanup to enable support of
- 'pure' fucntion & task declarations (these have no bodies). These
- efforts together fix Verilog bug210 from veripool; which was also
+ (verilog-beg-of-statement): General cleanup to enable support of
+ 'pure' fucntion & task declarations (these have no bodies).
+ These efforts together fix Verilog bug210 from veripool; which was also
noticed by Steve Pearlmutter.
(verilog-directive-re, verilog-directive-begin, verilog-indent-re)
- (verilog-directive-nest-re, verilog-set-auto-endcomments): Support
- `elsif. Reported by Shankar Giri.
+ (verilog-directive-nest-re, verilog-set-auto-endcomments):
+ Support `elsif. Reported by Shankar Giri.
(verilog-forward-ws&directives, verilog-in-attribute-p): Fixes for
attribute handling for lining up declarations and assignments.
(verilog-beg-of-statement-1): Fix issue where continued declaration
@@ -260,8 +293,7 @@
(verilog-in-attribute-p, verilog-skip-backward-comments)
(verilog-skip-forward-comment-p): Support proper treatment of
attributes by indent code. Reported by Jeff Steele.
- (verilog-in-directive-p): Fix comment to correctly describe
- function.
+ (verilog-in-directive-p): Fix comment to correctly describe function.
(verilog-backward-up-list, verilog-in-struct-region-p)
(verilog-backward-token, verilog-in-struct-p)
(verilog-in-coverage-p, verilog-do-indent)
@@ -288,7 +320,7 @@
parameter in AUTOINSTPARAM.
(verilog-read-always-signals-recurse, verilog-read-decls): Fix not
treating `elsif similar to `endif inside AUTOSENSE.
- (verilog-do-indent): Implement correct automatic or static task or
+ (verilog-do-indent): Implement correct automatic or static task or
function end comment highlight. Reported by Steve Pearlmutter.
(verilog-font-lock-keywords-2): Fix highlighting of single
character pins, bug264. Reported by Michael Laajanen.
@@ -296,15 +328,15 @@
(verilog-read-sub-decls-in-interfaced, verilog-read-sub-decls-sig)
(verilog-subdecls-get-interfaced, verilog-subdecls-new): Support
interfaces with AUTOINST, bug270. Reported by Luis Gutierrez.
- (verilog-pretty-expr): Fix interactive arguments, bug272. Reported
- by Mark Johnson.
- (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp): Add
- 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF,
+ (verilog-pretty-expr): Fix interactive arguments, bug272.
+ Reported by Mark Johnson.
+ (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp):
+ Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF,
bug269. Suggested by Gary Delp.
(verilog-mode-map, verilog-preprocess, verilog-preprocess-history)
- (verilog-preprocessor, verilog-set-compile-command): Create
- verilog-preprocess and verilog-preprocessor to show preprocessed
- output.
+ (verilog-preprocessor, verilog-set-compile-command):
+ Create verilog-preprocess and verilog-preprocessor to show
+ preprocessed output.
(verilog-get-beg-of-line, verilog-get-end-of-line)
(verilog-modi-file-or-buffer, verilog-modi-name)
(verilog-modi-point, verilog-within-string): Move defmacro's
@@ -352,8 +384,8 @@
(verilog-modi-lookup-last-current, verilog-modi-lookup-last-mod)
(verilog-modi-lookup-last-modi, verilog-modi-lookup-last-tick):
Fix slow verilog-auto expansion on very large files.
- (verilog-read-sub-decls-expr, verilog-read-sub-decls-line): Fix
- AUTOOUTPUT treating "1*2" as a signal name in submodule connection
+ (verilog-read-sub-decls-expr, verilog-read-sub-decls-line):
+ Fix AUTOOUTPUT treating "1*2" as a signal name in submodule connection
"{1*2{...". Broke in last revision.
(verilog-read-sub-decls-expr): Fix AUTOOUTPUT not detecting
submodule connections with replications "{#{a},#{b}}".
=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog 2010-10-14 14:32:27 +0000
+++ b/lisp/cedet/ChangeLog 2010-10-31 14:40:01 +0000
@@ -1,3 +1,17 @@
+2010-10-31 Glenn Morris <address@hidden>
+
+ * mode-local.el (mode-local-augment-function-help):
+ * semantic/analyze/debug.el (semantic-analyzer-debug-add-buttons):
+ * semantic/symref/list.el (semantic-symref-results-dump)
+ (semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses
+ of toggle-read-only.
+
+2010-10-31 Juanma Barranquero <address@hidden>
+
+ * semantic/symref/list.el (semantic-symref-list-rename-open-hits):
+ Fix typo in message.
+ (semantic-symref-list-map-open-hits): Fix typo in docstring.
+
2010-09-30 Chong Yidong <address@hidden>
* semantic/bovine/el.el:
=== modified file 'lisp/cedet/mode-local.el'
--- a/lisp/cedet/mode-local.el 2010-01-13 08:35:10 +0000
+++ b/lisp/cedet/mode-local.el 2010-10-29 07:48:10 +0000
@@ -1,6 +1,7 @@
;;; mode-local.el --- Support for mode local facilities
;;
-;; Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation,
Inc.
+;; Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010
+;; Free Software Foundation, Inc.
;;
;; Author: David Ponce <address@hidden>
;; Maintainer: David Ponce <address@hidden>
@@ -610,19 +611,16 @@
SYMBOL is a function that can be overridden."
(with-current-buffer "*Help*"
(pop-to-buffer (current-buffer))
- (unwind-protect
- (progn
- (toggle-read-only -1)
- (goto-char (point-min))
- (unless (re-search-forward "^$" nil t)
- (goto-char (point-max))
- (beginning-of-line)
- (forward-line -1))
- (insert (overload-docstring-extension symbol) "\n")
- ;; NOTE TO SELF:
- ;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE
- )
- (toggle-read-only 1))))
+ (goto-char (point-min))
+ (unless (re-search-forward "^$" nil t)
+ (goto-char (point-max))
+ (beginning-of-line)
+ (forward-line -1))
+ (let ((inhibit-read-only t))
+ (insert (overload-docstring-extension symbol) "\n")
+ ;; NOTE TO SELF:
+ ;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE
+ )))
;; Help for mode-local bindings.
(defun mode-local-print-binding (symbol)
@@ -782,5 +780,4 @@
(provide 'mode-local)
-;; arch-tag: 14b77823-f93c-4b3d-9116-495f69a6ec07
;;; mode-local.el ends here
=== modified file 'lisp/cedet/semantic/analyze/debug.el'
--- a/lisp/cedet/semantic/analyze/debug.el 2010-09-19 02:49:54 +0000
+++ b/lisp/cedet/semantic/analyze/debug.el 2010-10-29 07:48:10 +0000
@@ -586,34 +586,28 @@
(set-marker orig-buffer (point) (current-buffer))
;; Get a buffer ready.
(with-current-buffer "*Help*"
- (toggle-read-only -1)
- (goto-char (point-min))
- (set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer)
- ;; First, add do-in buttons to recommendations.
- (while (re-search-forward "^\\s-*M-x \\(\\(\\w\\|\\s_\\)+\\) " nil t)
- (let ((fcn (match-string 1)))
- (when (not (fboundp (intern-soft fcn)))
- (error "Help Err: Can't find %s" fcn))
- (end-of-line)
- (insert " ")
- (insert-button "[ Do It ]"
- 'mouse-face 'custom-button-pressed-face
- 'do-fcn fcn
- 'action `(lambda (arg)
- (let ((M semantic-analyzer-debug-orig))
- (set-buffer (marker-buffer M))
- (goto-char M))
- (call-interactively (quote ,(intern-soft
fcn))))
- )
- ))
+ (let ((inhibit-read-only t))
+ (goto-char (point-min))
+ (set (make-local-variable 'semantic-analyzer-debug-orig) orig-buffer)
+ ;; First, add do-in buttons to recommendations.
+ (while (re-search-forward "^\\s-*M-x \\(\\(\\w\\|\\s_\\)+\\) " nil t)
+ (let ((fcn (match-string 1)))
+ (when (not (fboundp (intern-soft fcn)))
+ (error "Help Err: Can't find %s" fcn))
+ (end-of-line)
+ (insert " ")
+ (insert-button "[ Do It ]"
+ 'mouse-face 'custom-button-pressed-face
+ 'do-fcn fcn
+ 'action `(lambda (arg)
+ (let ((M semantic-analyzer-debug-orig))
+ (set-buffer (marker-buffer M))
+ (goto-char M))
+ (call-interactively (quote ,(intern-soft
fcn))))))))
;; Do something else?
-
;; Clean up the mess
- (toggle-read-only 1)
- (set-buffer-modified-p nil)
- )))
+ (set-buffer-modified-p nil))))
(provide 'semantic/analyze/debug)
-;; arch-tag: 943db1e5-47e6-4bec-9989-78ebfadf0358
;;; semantic/analyze/debug.el ends here
=== modified file 'lisp/cedet/semantic/symref/list.el'
--- a/lisp/cedet/semantic/symref/list.el 2010-10-14 14:32:27 +0000
+++ b/lisp/cedet/semantic/symref/list.el 2010-10-31 14:40:01 +0000
@@ -221,49 +221,38 @@
(defun semantic-symref-results-dump (results)
"Dump the RESULTS into the current buffer."
;; Get ready for the insert.
- (toggle-read-only -1)
- (erase-buffer)
-
- ;; Insert the contents.
- (let ((lastfile nil)
- )
- (dolist (T (oref results :hit-tags))
-
- (when (not (equal lastfile (semantic-tag-file-name T)))
- (setq lastfile (semantic-tag-file-name T))
- (insert-button lastfile
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ ;; Insert the contents.
+ (let ((lastfile nil))
+ (dolist (T (oref results :hit-tags))
+ (unless (equal lastfile (semantic-tag-file-name T))
+ (setq lastfile (semantic-tag-file-name T))
+ (insert-button lastfile
+ 'mouse-face 'custom-button-pressed-face
+ 'action 'semantic-symref-rb-goto-file
+ 'tag T)
+ (insert "\n"))
+ (insert " ")
+ (insert-button "[+]"
+ 'mouse-face 'highlight
+ 'face nil
+ 'action 'semantic-symref-rb-toggle-expand-tag
+ 'tag T
+ 'state 'closed)
+ (insert " ")
+ (insert-button (funcall semantic-symref-results-summary-function
+ T nil t)
'mouse-face 'custom-button-pressed-face
- 'action 'semantic-symref-rb-goto-file
- 'tag T
- )
- (insert "\n"))
-
- (insert " ")
- (insert-button "[+]"
- 'mouse-face 'highlight
- 'face nil
- 'action 'semantic-symref-rb-toggle-expand-tag
- 'tag T
- 'state 'closed)
- (insert " ")
- (insert-button (funcall semantic-symref-results-summary-function
- T nil t)
- 'mouse-face 'custom-button-pressed-face
- 'face nil
- 'action 'semantic-symref-rb-goto-tag
- 'tag T)
- (insert "\n")
-
- ))
-
- ;; Auto expand
- (when semantic-symref-auto-expand-results
- (semantic-symref-list-expand-all))
-
- ;; Clean up the mess
- (toggle-read-only 1)
- (set-buffer-modified-p nil)
- )
+ 'face nil
+ 'action 'semantic-symref-rb-goto-tag
+ 'tag T)
+ (insert "\n")))
+ ;; Auto expand
+ (when semantic-symref-auto-expand-results
+ (semantic-symref-list-expand-all)))
+ ;; Clean up the mess
+ (set-buffer-modified-p nil))
;;; Commands for semantic-symref-results
;;
@@ -283,11 +272,9 @@
(buff (semantic-tag-buffer tag))
(hits (semantic--tag-get-property tag :hit))
(state (button-get button 'state))
- (text nil)
- )
+ (text nil))
(cond
((eq state 'closed)
- (toggle-read-only -1)
(with-current-buffer buff
(dolist (H hits)
(goto-char (point-min))
@@ -295,48 +282,42 @@
(beginning-of-line)
(back-to-indentation)
(setq text (cons (buffer-substring (point) (point-at-eol)) text)))
- (setq text (nreverse text))
- )
+ (setq text (nreverse text)))
(goto-char (button-start button))
(forward-char 1)
- (delete-char 1)
- (insert "-")
- (button-put button 'state 'open)
- (save-excursion
- (end-of-line)
- (while text
- (insert "\n")
- (insert " ")
- (insert-button (car text)
- 'mouse-face 'highlight
- 'face nil
- 'action 'semantic-symref-rb-goto-match
- 'tag tag
- 'line (car hits))
- (setq text (cdr text)
- hits (cdr hits))))
- (toggle-read-only 1)
- )
+ (let ((inhibit-read-only t))
+ (delete-char 1)
+ (insert "-")
+ (button-put button 'state 'open)
+ (save-excursion
+ (end-of-line)
+ (while text
+ (insert "\n")
+ (insert " ")
+ (insert-button (car text)
+ 'mouse-face 'highlight
+ 'face nil
+ 'action 'semantic-symref-rb-goto-match
+ 'tag tag
+ 'line (car hits))
+ (setq text (cdr text)
+ hits (cdr hits))))))
((eq state 'open)
- (toggle-read-only -1)
- (button-put button 'state 'closed)
- ;; Delete the various bits.
- (goto-char (button-start button))
- (forward-char 1)
- (delete-char 1)
- (insert "+")
- (save-excursion
- (end-of-line)
+ (let ((inhibit-read-only t))
+ (button-put button 'state 'closed)
+ ;; Delete the various bits.
+ (goto-char (button-start button))
(forward-char 1)
- (delete-region (point)
- (save-excursion
- (forward-char 1)
- (forward-line (length hits))
- (point))))
- (toggle-read-only 1)
- )
- ))
- )
+ (delete-char 1)
+ (insert "+")
+ (save-excursion
+ (end-of-line)
+ (forward-char 1)
+ (delete-region (point)
+ (save-excursion
+ (forward-char 1)
+ (forward-line (length hits))
+ (point)))))))))
(defun semantic-symref-rb-goto-file (&optional button)
"Go to the file specified in the symref results buffer.
@@ -554,5 +535,4 @@
;; generated-autoload-load-name: "semantic/symref/list"
;; End:
-;; arch-tag: e355d9c6-26e0-42d1-9bf1-f4801a54fffa
;;; semantic/symref/list.el ends here
=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el 2010-10-29 03:29:29 +0000
+++ b/lisp/menu-bar.el 2010-10-31 14:40:01 +0000
@@ -83,8 +83,8 @@
(define-key global-map [menu-bar help-menu]
(cons (purecopy "Info") menu-bar-help-menu)))
-;; This alias is for compatibility with 19.28 and before.
-(defvar menu-bar-files-menu menu-bar-file-menu)
+;; Only declared obsolete (and only made a proper alias) in 23.3.
+(define-obsolete-variable-alias 'menu-bar-files-menu 'menu-bar-file-menu
"22.1")
;; This is referenced by some code below; it is defined in uniquify.el
(defvar uniquify-buffer-name-style)
=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-10-24 21:36:09 +0000
+++ b/lisp/net/tramp.el 2010-10-31 14:40:01 +0000
@@ -2861,7 +2861,11 @@
(setq buffer-file-name filename)
(setq buffer-read-only (not (file-writable-p filename)))
(set-visited-file-modtime)
- (set-buffer-modified-p nil))
+ (set-buffer-modified-p nil)
+ ;; For root, preserve owner and group when editing files.
+ (when (string-equal (file-remote-p filename 'user) "root")
+ (set (make-local-variable 'backup-by-copying-when-mismatch) t)
+ (put 'backup-by-copying-when-mismatch 'permanent-local t)))
(when (and (stringp local-copy)
(or remote-copy (null tramp-temp-buffer-file-name)))
(delete-file local-copy))
=== modified file 'lisp/play/fortune.el'
--- a/lisp/play/fortune.el 2010-01-13 08:35:10 +0000
+++ b/lisp/play/fortune.el 2010-10-29 07:48:10 +0000
@@ -1,7 +1,7 @@
;;; fortune.el --- use fortune to create signatures
-;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Free Software Foundation, Inc.
;; Author: Holger Schauer <address@hidden>
;; Keywords: games utils mail
@@ -285,48 +285,41 @@
;;; Display fortune
(defun fortune-in-buffer (interactive &optional file)
"Put a fortune cookie in the *fortune* buffer.
-
-INTERACTIVE is ignored. Optional argument FILE,
-when supplied, specifies the file to choose the fortune from."
+INTERACTIVE is ignored. Optional argument FILE, when supplied,
+specifies the file to choose the fortune from."
(let ((fortune-buffer (or (get-buffer fortune-buffer-name)
(generate-new-buffer fortune-buffer-name)))
(fort-file (expand-file-name
(substitute-in-file-name
(or file fortune-file)))))
(with-current-buffer fortune-buffer
- (toggle-read-only 0)
- (erase-buffer)
-
- (if fortune-always-compile
- (fortune-compile fort-file))
-
- (apply 'call-process
- fortune-program ; program to call
- nil fortune-buffer nil ; INFILE BUFFER DISPLAY
- (append (if (stringp fortune-program-options)
- (split-string fortune-program-options)
- fortune-program-options) (list fort-file))))))
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ (if fortune-always-compile
+ (fortune-compile fort-file))
+ (apply 'call-process
+ fortune-program ; program to call
+ nil fortune-buffer nil ; INFILE BUFFER DISPLAY
+ (append (if (stringp fortune-program-options)
+ (split-string fortune-program-options)
+ fortune-program-options) (list fort-file)))))))
;;;###autoload
(defun fortune (&optional file)
"Display a fortune cookie.
-
If called with a prefix asks for the FILE to choose the fortune from,
otherwise uses the value of `fortune-file'. If you want to have fortune
choose from a set of files in a directory, call interactively with prefix
and choose the directory as the fortune-file."
- (interactive
- (list
- (if current-prefix-arg
- (fortune-ask-file)
- fortune-file)))
+ (interactive (list (if current-prefix-arg
+ (fortune-ask-file)
+ fortune-file)))
(fortune-in-buffer t file)
(switch-to-buffer (get-buffer fortune-buffer-name))
- (toggle-read-only 1))
+ (setq buffer-read-only t))
;;; Provide ourselves.
(provide 'fortune)
-;; arch-tag: a1e4cb8a-3792-40e7-86a7-fc75ce094bcc
;;; fortune.el ends here
=== modified file 'lisp/play/gomoku.el'
--- a/lisp/play/gomoku.el 2010-04-15 01:12:20 +0000
+++ b/lisp/play/gomoku.el 2010-10-31 14:40:01 +0000
@@ -1,7 +1,7 @@
;;; gomoku.el --- Gomoku game between you and Emacs
-;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Philippe Schnoebelen <address@hidden>
;; Maintainer: FSF
@@ -195,8 +195,8 @@
\\{gomoku-mode-map}"
(gomoku-display-statistics)
(make-local-variable 'font-lock-defaults)
- (setq font-lock-defaults '(gomoku-font-lock-keywords t))
- (toggle-read-only t))
+ (setq font-lock-defaults '(gomoku-font-lock-keywords t)
+ buffer-read-only t))
;;;
;;; THE BOARD.
@@ -1206,5 +1206,4 @@
(provide 'gomoku)
-;; arch-tag: b1b8205e-77fc-4597-b373-3ea2c04311eb
;;; gomoku.el ends here
=== modified file 'lisp/play/landmark.el'
--- a/lisp/play/landmark.el 2010-10-27 14:31:44 +0000
+++ b/lisp/play/landmark.el 2010-10-31 14:40:01 +0000
@@ -255,8 +255,8 @@
(lm-display-statistics)
(use-local-map lm-mode-map)
(make-local-variable 'font-lock-defaults)
- (setq font-lock-defaults '(lm-font-lock-keywords t))
- (toggle-read-only t)
+ (setq font-lock-defaults '(lm-font-lock-keywords t)
+ buffer-read-only t)
(run-mode-hooks 'lm-mode-hook))
@@ -1702,5 +1702,4 @@
(provide 'landmark)
-;; arch-tag: ae5031be-96e6-459e-a3df-1df53117d3f2
;;; landmark.el ends here
=== modified file 'lisp/progmodes/sql.el'
--- a/lisp/progmodes/sql.el 2010-09-19 02:11:18 +0000
+++ b/lisp/progmodes/sql.el 2010-10-31 14:40:01 +0000
@@ -7,7 +7,8 @@
;; Maintainer: Michael Mauger <address@hidden>
;; Version: 2.8
;; Keywords: comm languages processes
-;; URL:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el
+;; URL: http://savannah.gnu.org/projects/emacs/
+;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
;; This file is part of GNU Emacs.
@@ -4270,6 +4271,5 @@
(provide 'sql)
-;; arch-tag: 7e1fa1c4-9ca2-402e-87d2-83a5eccb7ac3
;;; sql.el ends here
=== modified file 'lisp/select.el'
--- a/lisp/select.el 2010-10-24 02:22:43 +0000
+++ b/lisp/select.el 2010-10-31 14:40:01 +0000
@@ -75,8 +75,9 @@
(declare-function x-get-selection-internal "xselect.c"
(selection-symbol target-type &optional time-stamp))
-;; This is for temporary compatibility with pre-release Emacs 19.
-(defalias 'x-selection 'x-get-selection)
+;; Only declared obsolete in 23.3.
+(define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34")
+
(defun x-get-selection (&optional type data-type)
"Return the value of an X Windows selection.
The argument TYPE (default `PRIMARY') says which selection,
=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el 2010-05-27 23:30:11 +0000
+++ b/lisp/speedbar.el 2010-10-31 14:40:01 +0000
@@ -1,7 +1,8 @@
;;; speedbar --- quick access to files and tags in a frame
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009, 2010
+;; Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <address@hidden>
;; Keywords: file, tags, tools
@@ -1128,9 +1129,9 @@
(setq font-lock-keywords nil) ;; no font-locking please
(setq truncate-lines t)
(make-local-variable 'frame-title-format)
- (setq frame-title-format (concat "Speedbar " speedbar-version))
- (setq case-fold-search nil)
- (toggle-read-only 1)
+ (setq frame-title-format (concat "Speedbar " speedbar-version)
+ case-fold-search nil
+ buffer-read-only t)
(speedbar-set-mode-line-format)
;; Add in our dframe hooks.
(if speedbar-track-mouse-flag
@@ -4142,5 +4143,4 @@
;; run load-time hooks
(run-hooks 'speedbar-load-hook)
-;; arch-tag: 4477e6d1-f78c-48b9-a503-387d3c9767d5
;;; speedbar ends here
=== modified file 'lisp/textmodes/bibtex.el'
--- a/lisp/textmodes/bibtex.el 2010-09-10 23:13:42 +0000
+++ b/lisp/textmodes/bibtex.el 2010-10-31 14:40:01 +0000
@@ -1,7 +1,8 @@
;;; bibtex.el --- BibTeX mode for GNU Emacs
;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
Inc.
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Free Software Foundation, Inc.
;; Author: Stefan Schoef <address@hidden>
;; Bengt Martensson <address@hidden>
@@ -3835,16 +3836,16 @@
(with-current-buffer (get-buffer-create err-buf)
(setq default-directory dir)
(unless (eq major-mode 'compilation-mode) (compilation-mode))
- (toggle-read-only -1)
- (delete-region (point-min) (point-max))
- (insert "BibTeX mode command `bibtex-validate'\n"
- (if syntax-error
- "Maybe undetected errors due to syntax errors.
Correct and validate again.\n"
- "\n"))
- (dolist (err error-list)
- (insert (format "%s:%d: %s\n" file (car err) (cdr err))))
- (set-buffer-modified-p nil)
- (toggle-read-only 1)
+ (let ((inhibit-read-only t))
+ (delete-region (point-min) (point-max))
+ (insert "BibTeX mode command `bibtex-validate'\n"
+ (if syntax-error
+ "Maybe undetected errors due to syntax errors. \
+Correct and validate again.\n"
+ "\n"))
+ (dolist (err error-list)
+ (insert (format "%s:%d: %s\n" file (car err) (cdr err))))
+ (set-buffer-modified-p nil))
(goto-char (point-min))
(forward-line 2)) ; first error message
(display-buffer err-buf)
@@ -3896,12 +3897,11 @@
(let ((err-buf "*BibTeX validation errors*"))
(with-current-buffer (get-buffer-create err-buf)
(unless (eq major-mode 'compilation-mode) (compilation-mode))
- (toggle-read-only -1)
- (delete-region (point-min) (point-max))
- (insert "BibTeX mode command `bibtex-validate-globally'\n\n")
- (dolist (err (sort error-list 'string-lessp)) (insert err))
- (set-buffer-modified-p nil)
- (toggle-read-only 1)
+ (let ((inhibit-read-only t))
+ (delete-region (point-min) (point-max))
+ (insert "BibTeX mode command `bibtex-validate-globally'\n\n")
+ (dolist (err (sort error-list 'string-lessp)) (insert err))
+ (set-buffer-modified-p nil))
(goto-char (point-min))
(forward-line 2)) ; first error message
(display-buffer err-buf)
@@ -4778,5 +4778,4 @@
(provide 'bibtex)
-;; arch-tag: ee2be3af-caad-427f-b42a-d20fad630d04
;;; bibtex.el ends here
=== modified file 'lisp/vc/add-log.el'
--- a/lisp/vc/add-log.el 2010-09-23 07:17:08 +0000
+++ b/lisp/vc/add-log.el 2010-10-31 14:40:01 +0000
@@ -698,7 +698,7 @@
Optional arg BUFFER-FILE overrides `buffer-file-name'."
;; If we are called from a diff, first switch to the source buffer;
;; in order to respect buffer-local settings of change-log-default-name, etc.
- (with-current-buffer (let ((buff (if (eq major-mode 'diff-mode)
+ (with-current-buffer (let ((buff (if (derived-mode-p 'diff-mode)
(car (ignore-errors
(diff-find-source-location))))))
(if (buffer-live-p buff) buff
@@ -1180,7 +1180,7 @@
((apply 'derived-mode-p add-log-c-like-modes)
(or (c-cpp-define-name)
(c-defun-name)))
- ((memq major-mode add-log-tex-like-modes)
+ ((apply #'derived-mode-p add-log-tex-like-modes)
(if (re-search-backward
"\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)"
nil t)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-10-29 10:43:38 +0000
+++ b/src/ChangeLog 2010-10-31 14:40:01 +0000
@@ -1,3 +1,15 @@
+2010-10-31 Chong Yidong <address@hidden>
+
+ * xterm.c (x_connection_closed): Print informative error message
+ when aborting on GTK. This requires using shut_down_emacs
+ directly instead of Fkill_emacs.
+
+2010-10-31 Michael Albinus <address@hidden>
+
+ * dbusbind.c (Fdbus_call_method_asynchronously)
+ (Fdbus_register_signal, Fdbus_register_method): Check, whether
+ `dbus-registered-objects-table' is initialized.
+
2010-10-29 Eli Zaretskii <address@hidden>
* emacs.c (main): Call syms_of_filelock unconditionally.
=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c 2010-10-11 23:57:49 +0000
+++ b/src/dbusbind.c 2010-10-31 14:40:01 +0000
@@ -1232,6 +1232,10 @@
SDATA (interface),
SDATA (method));
+ /* Check dbus-registered-objects-table. */
+ if (!HASH_TABLE_P (Vdbus_registered_objects_table))
+ XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
+
/* Open a connection to the bus. */
connection = xd_initialize (bus, TRUE);
@@ -1869,6 +1873,10 @@
wrong_type_argument (intern ("functionp"), handler);
GCPRO6 (bus, service, path, interface, signal, handler);
+ /* Check dbus-registered-objects-table. */
+ if (!HASH_TABLE_P (Vdbus_registered_objects_table))
+ XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
+
/* Retrieve unique name of service. If service is a known name, we
will register for the corresponding unique name, if any. Signals
are sent always with the unique name as sender. Note: the unique
@@ -1981,6 +1989,10 @@
/* TODO: We must check for a valid service name, otherwise there is
a segmentation fault. */
+ /* Check dbus-registered-objects-table. */
+ if (!HASH_TABLE_P (Vdbus_registered_objects_table))
+ XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
+
/* Open a connection to the bus. */
connection = xd_initialize (bus, TRUE);
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2010-10-25 16:04:54 +0000
+++ b/src/xterm.c 2010-10-31 14:40:01 +0000
@@ -7670,47 +7670,44 @@
delete_frame (frame, Qnoelisp);
}
- /* We have to close the display to inform Xt that it doesn't
- exist anymore. If we don't, Xt will continue to wait for
- events from the display. As a consequence, a sequence of
-
- M-x make-frame-on-display RET :1 RET
- ...kill the new frame, so that we get an IO error...
- M-x make-frame-on-display RET :1 RET
-
- will indefinitely wait in Xt for events for display `:1', opened
- in the first call to make-frame-on-display.
-
- Closing the display is reported to lead to a bus error on
- OpenWindows in certain situations. I suspect that is a bug
- in OpenWindows. I don't know how to circumvent it here. */
-
+ /* If DPYINFO is null, this means we didn't open the display in the
+ first place, so don't try to close it. */
if (dpyinfo)
{
#ifdef USE_X_TOOLKIT
- /* If DPYINFO is null, this means we didn't open the display
- in the first place, so don't try to close it. */
- {
- fatal_error_signal_hook = x_fatal_error_signal;
- XtCloseDisplay (dpy);
- fatal_error_signal_hook = NULL;
- }
-#endif
+ /* We have to close the display to inform Xt that it doesn't
+ exist anymore. If we don't, Xt will continue to wait for
+ events from the display. As a consequence, a sequence of
+
+ M-x make-frame-on-display RET :1 RET
+ ...kill the new frame, so that we get an IO error...
+ M-x make-frame-on-display RET :1 RET
+
+ will indefinitely wait in Xt for events for display `:1',
+ opened in the first call to make-frame-on-display.
+
+ Closing the display is reported to lead to a bus error on
+ OpenWindows in certain situations. I suspect that is a bug
+ in OpenWindows. I don't know how to circumvent it here. */
+ extern void (*fatal_error_signal_hook) P_ ((void));
+ fatal_error_signal_hook = x_fatal_error_signal;
+ XtCloseDisplay (dpy);
+ fatal_error_signal_hook = NULL;
+#endif /* USE_X_TOOLKIT */
#ifdef USE_GTK
- /* There is a long-standing bug in GTK that prevents the GTK
- main loop from recovering gracefully from disconnects
- (https://bugzilla.gnome.org/show_bug.cgi?id=85715). Among
- other problems, this gives rise to a stream of Glib error
- messages that, in one incident, filled up a user's hard disk
- (http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00927.html).
- So, kill Emacs unconditionally if the display is closed. */
- {
- fprintf (stderr, "%s\n", error_msg);
- Fkill_emacs (make_number (70));
- abort (); /* NOTREACHED */
- }
-#endif
+ /* A long-standing GTK bug prevents proper disconnect handling
+ (https://bugzilla.gnome.org/show_bug.cgi?id=85715). Once,
+ the resulting Glib error message loop filled a user's disk.
+ To avoid this, kill Emacs unconditionally on disconnect. */
+ shut_down_emacs (0, 0, Qnil);
+ fprintf (stderr, "%s\n\
+When compiled with GTK, Emacs cannot recover from X disconnects.\n\
+This is a GTK bug: https://bugzilla.gnome.org/show_bug.cgi?id=85715\n\
+For details, see etc/PROBLEMS.\n",
+ error_msg);
+ abort ();
+#endif /* USE_GTK */
/* Indicate that this display is dead. */
dpyinfo->display = 0;
- [Emacs-diffs] /srv/bzr/emacs/trunk r102166: Merge changes from emacs-23 branch,
Chong Yidong <=