[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114316: Merge from emacs-24; up to r111406
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114316: Merge from emacs-24; up to r111406 |
Date: |
Tue, 17 Sep 2013 07:28:33 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114316 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 00:26:07 -0700
message:
Merge from emacs-24; up to r111406
modified:
etc/CONTRIBUTE contribute-20091113204419-o5vbwnq5f7feedwu-6333
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/abbrev.el abbrev.el-20091113204419-o5vbwnq5f7feedwu-281
lisp/subr.el subr.el-20091113204419-o5vbwnq5f7feedwu-151
=== modified file 'etc/CONTRIBUTE'
--- a/etc/CONTRIBUTE 2013-02-16 20:24:50 +0000
+++ b/etc/CONTRIBUTE 2013-09-16 18:37:18 +0000
@@ -60,6 +60,11 @@
answers), at the address@hidden mailing list.
A copyright disclaimer is also a possibility, but we prefer an assignment.
+Note that the disclaimer, like an assignment, involves you sending
+signed paperwork to the FSF (simply saying "this is in the public domain"
+is not enough). Also, a disclaimer cannot be applied to future work, it
+has to be repeated each time you want to send something new.
+
We can accept small changes (roughly, fewer than 15 lines) without
an assignment. This is a cumulative limit (e.g. three separate 5 line
patches) over all your contributions.
@@ -94,8 +99,7 @@
** Description
-For bug fixes, a description of the bug and how your patch fixes this
-bug.
+For bug fixes, a description of the bug and how your patch fixes it.
For new features, a description of the feature and your implementation.
@@ -103,7 +107,7 @@
A ChangeLog entry as plaintext (separate from the patch).
-See the various ChangeLog files for format and content. Note that,
+See the existing ChangeLog files for format and content. Note that,
unlike some other projects, we do require ChangeLogs also for
documentation, i.e. Texinfo files.
@@ -112,24 +116,16 @@
** The patch itself.
-Please use "Context Diff" format.
-
If you are accessing the Bazaar repository, make sure your copy is
up-to-date (e.g. with `bzr pull'), then use
bzr diff --no-aliases --diff-options=-cp
Else, use
diff -cp OLD NEW
-If your version of diff does not support these options, then get the
-latest version of GNU Diff.
-
** Mail format.
-We prefer to get the patches as inline plain text.
-
-Please be aware of line wrapping which will make the patch unreadable
-and useless for us. To avoid that, you can use MIME attachments or,
-as a last resort, uuencoded gzipped text.
+We prefer to get the patches as plain text, either inline (be careful
+your mail client does not change line breaks) or as MIME attachments.
** Please reread your patch before submitting it.
@@ -179,18 +175,12 @@
** Document your changes.
-Think carefully about whether your change requires updating the
-documentation. If it does, you can either do this yourself or add an
-item to the NEWS file.
-
-If you document your change in NEWS, please mark the NEWS entry with
-the documentation status of the change: if you submit the changes for
-the manuals, mark it with "+++"; if it doesn't need to be documented,
-mark it with "---"; if it needs to be documented, but you didn't
-submit documentation changes, leave the NEWS entry unmarked. (These
-marks are checked by the Emacs maintainers to make sure every change
-was reflected in the manuals.)
-
+Any change that matters to end-users should have a NEWS entry.
+
+Think about whether your change requires updating the documentation
+(both manuals and doc-strings). If you know it does not, mark the NEWS
+entry with "---". If you know that *all* the necessary documentation
+updates have been made, mark the entry with "+++". Otherwise do not mark it.
** Understanding Emacs Internals.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-09-16 19:09:24 +0000
+++ b/lisp/ChangeLog 2013-09-17 07:26:07 +0000
@@ -1,3 +1,9 @@
+2013-09-17 Stefan Monnier <address@hidden>
+
+ * subr.el (eval-after-load): Preserve evaluation order (bug#15389).
+
+ * abbrev.el (abbrev--check-chars): Fix thinko (bug#15329).
+
2013-09-16 Stefan Monnier <address@hidden>
* icomplete.el (icomplete-in-buffer): New var.
=== modified file 'lisp/abbrev.el'
--- a/lisp/abbrev.el 2013-09-06 15:37:01 +0000
+++ b/lisp/abbrev.el 2013-09-17 07:26:07 +0000
@@ -607,9 +607,9 @@
"Check if the characters in ABBREV have word syntax in either the
current (if global is nil) or standard syntax table."
(with-syntax-table
- (cond ((null global) (standard-syntax-table))
+ (cond ((null global) (syntax-table))
;; ((syntax-table-p global) global)
- (t (syntax-table)))
+ (t (standard-syntax-table)))
(when (string-match "\\W" abbrev)
(let ((badchars ())
(pos 0))
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2013-09-12 06:37:02 +0000
+++ b/lisp/subr.el 2013-09-17 07:26:07 +0000
@@ -3878,7 +3878,7 @@
(when (equal file lfn)
(remove-hook 'after-load-functions fun)
(funcall func))))
- (add-hook 'after-load-functions fun)))))))
+ (add-hook 'after-load-functions fun 'append)))))))
;; Add FORM to the element unless it's already there.
(unless (member delayed-func (cdr elt))
(nconc elt (list delayed-func)))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114316: Merge from emacs-24; up to r111406,
Glenn Morris <=