[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108798: Merge from emacs-24; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108798: Merge from emacs-24; up to r108062 |
Date: |
Thu, 28 Jun 2012 23:28:37 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108798 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-28 23:28:37 -0700
message:
Merge from emacs-24; up to r108062
modified:
doc/emacs/ChangeLog
doc/emacs/fixit.texi
etc/PROBLEMS
lisp/ChangeLog
lisp/calendar/cal-dst.el
lisp/minibuffer.el
lisp/progmodes/cperl-mode.el
lisp/progmodes/f90.el
lisp/progmodes/which-func.el
lisp/textmodes/enriched.el
src/ChangeLog
src/charset.c
src/gnutls.c
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-06-27 03:24:29 +0000
+++ b/doc/emacs/ChangeLog 2012-06-29 06:28:37 +0000
@@ -1,3 +1,11 @@
+2012-06-29 Glenn Morris <address@hidden>
+
+ * fixit.texi (Undo): Grammar fixes. (Bug#11779)
+
+2012-06-29 Michael Witten <address@hidden> (tiny change)
+
+ * fixit.texi (Undo): Fix typo. (Bug#11775)
+
2012-06-27 Glenn Morris <address@hidden>
* ack.texi (Acknowledgments): Tiny update.
=== modified file 'doc/emacs/fixit.texi'
--- a/doc/emacs/fixit.texi 2012-05-27 01:25:06 +0000
+++ b/doc/emacs/fixit.texi 2012-06-29 06:28:37 +0000
@@ -35,7 +35,7 @@
The @dfn{undo} command reverses recent changes in the buffer's text.
Each buffer records changes individually, and the undo command always
applies to the current buffer. You can undo all the changes in a
-buffer for as far as back its records go. Usually, each editing
+buffer for as far back as the buffer's records go. Usually, each editing
command makes a separate entry in the undo records, but some commands
such as @code{query-replace} divide their changes into multiple
entries for flexibility in undoing. Consecutive character insertion
@@ -109,9 +109,9 @@
@vindex undo-strong-limit
@vindex undo-outer-limit
@cindex undo limit
- When the undo records for a buffer becomes too large, Emacs discards
-the oldest undo records from time to time (during @dfn{garbage
-collection}). You can specify how much undo records to keep by
+ When the undo information for a buffer becomes too large, Emacs discards
+the oldest records from time to time (during @dfn{garbage
+collection}). You can specify how much undo information to keep by
setting the variables @code{undo-limit}, @code{undo-strong-limit}, and
@code{undo-outer-limit}. Their values are expressed in bytes.
=== modified file 'etc/PROBLEMS'
--- a/etc/PROBLEMS 2012-06-04 17:17:48 +0000
+++ b/etc/PROBLEMS 2012-06-29 06:28:37 +0000
@@ -255,6 +255,36 @@
If you need Emacs to be able to recover from closing displays, compile
it with the Lucid toolkit instead of GTK.
+** Emacs crashes when you try to view a file with complex characters.
+For example, the etc/HELLO file (as shown by C-h h).
+The message "symbol lookup error: /usr/bin/emacs: undefined symbol: OTF_open"
+is shown in the terminal from which you launched Emacs.
+This problem only happens when you use a graphical display (ie not
+with -nw) and compiled Emacs with the "libotf" library for complex
+text handling.
+
+This problem occurs because unfortunately there are two libraries
+called "libotf". One is the library for handling OpenType fonts,
+http://www.m17n.org/libotf/, which is the one that Emacs expects.
+The other is a library for Open Trace Format, and is used by some
+versions of the MPI message passing interface for parallel
+programming.
+
+For example, on RHEL6 GNU/Linux, the OpenMPI rpm provides a version
+of "libotf.so" in /usr/lib/openmpi/lib. This directory is not
+normally in the ld search path, but if you want to use OpenMPI,
+you must issue the command "module load openmpi". This adds
+/usr/lib/openmpi/lib to LD_LIBRARY_PATH. If you then start Emacs from
+the same shell, you will encounter this crash.
+Ref: <URL:https://bugzilla.redhat.com/show_bug.cgi?id=806031>
+
+There is no good solution to this problem if you need to use both
+OpenMPI and Emacs with libotf support. The best you can do is use a
+wrapper shell script (or function) "emacs" that removes the offending
+element from LD_LIBRARY_PATH before starting emacs proper.
+Or you could recompile Emacs with an -Wl,-rpath option that
+gives the location of the correct libotf.
+
* General runtime problems
** Lisp problems
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-28 23:04:27 +0000
+++ b/lisp/ChangeLog 2012-06-29 06:28:37 +0000
@@ -1,3 +1,32 @@
+2012-06-29 Andreas Schwab <address@hidden>
+
+ * calendar/cal-dst.el (calendar-current-time-zone):
+ Return calendar-current-time-zone-cache if non-nil.
+
+2012-06-29 Masatake YAMATO <address@hidden>
+
+ * progmodes/which-func.el (which-func-format):
+ Add mouse-face. (Bug#11698)
+
+2012-06-29 Leo Liu <address@hidden>
+
+ * textmodes/enriched.el (enriched-next-annotation): Use eq (Bug#11528).
+
+2012-06-29 Stefan Monnier <address@hidden>
+
+ * minibuffer.el (minibuffer-confirm-exit-commands):
+ Add completion-at-point (bug#11725).
+
+2012-06-29 Glenn Morris <address@hidden>
+
+ * progmodes/f90.el (f90-font-lock-keywords-2):
+ Add some preprocessor elements. (Bug#10499)
+
+2012-06-29 Stefan Monnier <address@hidden>
+
+ * progmodes/cperl-mode.el (cperl-update-syntaxification):
+ Use syntax-propertize (bug#11739).
+
2012-06-28 Juanma Barranquero <address@hidden>
* emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811).
=== modified file 'lisp/calendar/cal-dst.el'
--- a/lisp/calendar/cal-dst.el 2012-01-19 07:21:25 +0000
+++ b/lisp/calendar/cal-dst.el 2012-06-28 12:13:38 +0000
@@ -347,8 +347,8 @@
Some operating systems cannot provide all this information to Emacs; in this
case, `calendar-current-time-zone' returns a list containing nil for the data
it can't find."
- (unless calendar-current-time-zone-cache
- (setq calendar-current-time-zone-cache (calendar-dst-find-data))))
+ (or calendar-current-time-zone-cache
+ (setq calendar-current-time-zone-cache (calendar-dst-find-data))))
;; Following options should be set based on conditions when the code
=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el 2012-06-23 03:48:18 +0000
+++ b/lisp/minibuffer.el 2012-06-29 06:28:37 +0000
@@ -1136,7 +1136,8 @@
(completion--cache-all-sorted-completions (cdr all)))))))
(defvar minibuffer-confirm-exit-commands
- '(minibuffer-complete minibuffer-complete-word PC-complete PC-complete-word)
+ '(completion-at-point minibuffer-complete
+ minibuffer-complete-word PC-complete PC-complete-word)
"A list of commands which cause an immediately following
`minibuffer-complete-and-exit' to ask for extra confirmation.")
=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el 2012-06-26 16:23:01 +0000
+++ b/lisp/progmodes/cperl-mode.el 2012-06-29 06:28:37 +0000
@@ -8950,14 +8950,15 @@
(setq cperl-syntax-done-to (min cperl-syntax-done-to beg))))
(defun cperl-update-syntaxification (from to)
- (if (and cperl-use-syntax-table-text-property
- cperl-syntaxify-by-font-lock
- (or (null cperl-syntax-done-to)
- (< cperl-syntax-done-to to)))
- (progn
- (save-excursion
- (goto-char from)
- (cperl-fontify-syntaxically to)))))
+ (cond
+ ((not cperl-use-syntax-table-text-property) nil)
+ ((fboundp 'syntax-propertize) (syntax-propertize to))
+ ((and cperl-syntaxify-by-font-lock
+ (or (null cperl-syntax-done-to)
+ (< cperl-syntax-done-to to)))
+ (save-excursion
+ (goto-char from)
+ (cperl-fontify-syntaxically to)))))
(defvar cperl-version
(let ((v "Revision: 6.2"))
=== modified file 'lisp/progmodes/f90.el'
--- a/lisp/progmodes/f90.el 2012-05-05 02:50:20 +0000
+++ b/lisp/progmodes/f90.el 2012-06-29 06:28:37 +0000
@@ -233,6 +233,7 @@
:safe 'stringp
:group 'f90-indent)
+;; Should we add ^# to this? That's not really a comment.
(defcustom f90-directive-comment-re "!hpf\\$"
"Regexp of comment-like directive like \"!HPF\\\\$\", not to be indented."
:type 'regexp
@@ -627,7 +628,14 @@
'("\\<\\(do\\|go[ \t]*to\\)\\>[ \t]*\\([0-9]+\\)"
(1 font-lock-keyword-face) (2 font-lock-constant-face))
;; Line numbers (lines whose first character after number is letter).
- '("^[ \t]*\\([0-9]+\\)[ \t]*[a-z]+" (1 font-lock-constant-face t))))
+ '("^[ \t]*\\([0-9]+\\)[ \t]*[a-z]+" (1 font-lock-constant-face t))
+ ;; Override eg for "#include".
+ '("^#[ \t]*\\w+" (0 font-lock-preprocessor-face t)
+ ("\\<defined\\>" nil nil (0 font-lock-preprocessor-face)))
+ '("^#" ("\\(&&\\|||\\)" nil nil (0 font-lock-constant-face t)))
+ '("^#[ \t]*define[ \t]+\\(\\w+\\)(" (1 font-lock-function-name-face))
+ '("^#[ \t]*define[ \t]+\\(\\w+\\)" (1 font-lock-variable-name-face))
+ '("^#[ \t]*include[ \t]+\\(<.+>\\)" (1 font-lock-string-face))))
"Highlights declarations, do-loops and other constructs.")
(defvar f90-font-lock-keywords-3
=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el 2012-06-03 11:10:44 +0000
+++ b/lisp/progmodes/which-func.el 2012-06-29 06:28:37 +0000
@@ -144,12 +144,13 @@
(:propertize which-func-current
local-map ,which-func-keymap
face which-func
- ;;mouse-face highlight ; currently not evaluated :-(
+ mouse-face mode-line-highlight
help-echo "mouse-1: go to beginning\n\
mouse-2: toggle rest visibility\n\
mouse-3: go to end")
"]")
"Format for displaying the function in the mode line."
+ :version "24.2" ; added mouse-face
:group 'which-func
:type 'sexp)
;;;###autoload (put 'which-func-format 'risky-local-variable t)
=== modified file 'lisp/textmodes/enriched.el'
--- a/lisp/textmodes/enriched.el 2012-02-08 02:12:24 +0000
+++ b/lisp/textmodes/enriched.el 2012-06-23 13:33:44 +0000
@@ -437,7 +437,7 @@
(progn (goto-char (match-beginning 0))
(not (looking-at enriched-annotation-regexp))))
(forward-char 1)
- (if (= ?< (char-after (point)))
+ (if (eq ?< (char-after (point)))
(delete-char 1)
;; A single < that does not start an annotation is an error,
;; which we note and then ignore.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-29 02:19:32 +0000
+++ b/src/ChangeLog 2012-06-29 06:28:37 +0000
@@ -1,3 +1,12 @@
+2012-06-29 Andreas Schwab <address@hidden>
+
+ * gnutls.c (emacs_gnutls_handshake):
+ Add QUIT to make the loop interruptible.
+
+2012-06-29 Glenn Morris <address@hidden>
+
+ * charset.c (init_charset): Make lack of etc/charsets fatal.
+
2012-06-29 Dmitry Antipov <address@hidden>
* editfns.c (region_limit): Fix type mismatch.
=== modified file 'src/charset.c'
--- a/src/charset.c 2012-05-31 06:06:42 +0000
+++ b/src/charset.c 2012-06-29 06:28:37 +0000
@@ -2296,11 +2296,15 @@
tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory);
if (access (SSDATA (tempdir), 0) < 0)
{
- dir_warning ("Error: charsets directory (%s) does not exist.\n\
+ /* This used to be non-fatal (dir_warning), but it should not
+ happen, and if it does sooner or later it will cause some
+ obscure problem (eg bug#6401), so better abort. */
+ fprintf (stderr, "Error: charsets directory not found:\n\
+%s\n\
Emacs will not function correctly without the character map files.\n\
Please check your installation!\n",
- tempdir);
- /* TODO should this be a fatal error? (Bug#909) */
+ SDATA (tempdir));
+ exit (1);
}
Vcharset_map_path = Fcons (tempdir, Qnil);
=== modified file 'src/gnutls.c'
--- a/src/gnutls.c 2012-05-25 18:19:24 +0000
+++ b/src/gnutls.c 2012-06-29 06:28:37 +0000
@@ -322,6 +322,7 @@
{
ret = fn_gnutls_handshake (state);
emacs_gnutls_handle_error (state, ret);
+ QUIT;
}
while (ret < 0 && fn_gnutls_error_is_fatal (ret) == 0);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108798: Merge from emacs-24; up to r108062,
Glenn Morris <=