commit/xemacs-packages: 3 new changesets
10 years, 7 months
Bitbucket
Bitbucket
3 new commits in xemacs-packages:
https://bitbucket.org/xemacs/xemacs-packages/commits/907d6732018b/
Changeset: 907d6732018b
User: Norbert Koch
Date: 2013-09-19 10:01:23
Summary: update cc-mode
Affected #: 1 file
diff -r 0c5a1e2bb50f17b2a47ba00718b7dffb6bea1159 -r 907d6732018b081892e7072d355da959008ccc94 .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
＠＠ -17,7 +17,7 ＠＠
da4e7d4a51c502e5ac05a224cb756f382f0ba4d7 xemacs-packages/c-support
11074b3808d1e349f3fddb3c4d50f8be7c0f859e xemacs-packages/calc
7524e4fb9de45d77812090a724fac4ebd7549d6e xemacs-packages/calendar
-fd24c013f5a9dd41fdd9e4c13557fed8276f848a xemacs-packages/cc-mode
+828f2446cd8992e30acc22881da5c7313fafb09b xemacs-packages/cc-mode
a7ae1cfb2376bcd32617c1c88afe08872b11d298 xemacs-packages/cedet-common
87dd21fac17ea98219267b1378b4696698d6c4ff xemacs-packages/clearcase
e18acdbfcd36295d052cd56fa2e6d78c68b4b7d4 xemacs-packages/cogre
https://bitbucket.org/xemacs/xemacs-packages/commits/ecc4da9109b7/
Changeset: ecc4da9109b7
User: Norbert Koch
Date: 2013-09-19 10:01:53
Summary: XEmacs Package Release
Affected #: 1 file
diff -r 907d6732018b081892e7072d355da959008ccc94 -r ecc4da9109b772fd78948375e0b6c4b05a1ed4f2 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,7 ＠＠
+2013-09-19 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: cc-mode.
+
2013-09-02 Norbert Koch <viteno(a)xemacs.org>
* Packages released: leim, erc, misc-games, xemacs-base.
https://bitbucket.org/xemacs/xemacs-packages/commits/18c631ce2ae8/
Changeset: 18c631ce2ae8
User: Norbert Koch
Date: 2013-09-19 10:36:51
Summary: pre-release cc-mode
Affected #: 1 file
diff -r ecc4da9109b772fd78948375e0b6c4b05a1ed4f2 -r 18c631ce2ae802210e0acdb6323bf331fe304d88 .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
＠＠ -17,7 +17,7 ＠＠
da4e7d4a51c502e5ac05a224cb756f382f0ba4d7 xemacs-packages/c-support
11074b3808d1e349f3fddb3c4d50f8be7c0f859e xemacs-packages/calc
7524e4fb9de45d77812090a724fac4ebd7549d6e xemacs-packages/calendar
-828f2446cd8992e30acc22881da5c7313fafb09b xemacs-packages/cc-mode
+fbbd5245fbdc4d5ceed93b22be13f47fa78d48a2 xemacs-packages/cc-mode
a7ae1cfb2376bcd32617c1c88afe08872b11d298 xemacs-packages/cedet-common
87dd21fac17ea98219267b1378b4696698d6c4ff xemacs-packages/clearcase
e18acdbfcd36295d052cd56fa2e6d78c68b4b7d4 xemacs-packages/cogre
Repository URL: https://bitbucket.org/xemacs/xemacs-packages/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/cc-mode: 2 new changesets
10 years, 7 months
Bitbucket
Bitbucket
2 new commits in cc-mode:
https://bitbucket.org/xemacs/cc-mode/commits/e4b17748254e/
Changeset: e4b17748254e
User: Norbert Koch
Date: 2013-09-19 10:01:52
Summary: XEmacs Package Release 1.70
Affected #: 2 files
diff -r 828f2446cd8992e30acc22881da5c7313fafb09b -r e4b17748254e2efd679b7f2bcc92c6f7e0204ae1 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,7 ＠＠
+2013-09-19 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.70 released.
+
2013-06-03 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.69 released.
diff -r 828f2446cd8992e30acc22881da5c7313fafb09b -r e4b17748254e2efd679b7f2bcc92c6f7e0204ae1 Makefile
--- a/Makefile
+++ b/Makefile
＠＠ -17,7 +17,7 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.69
+VERSION = 1.70
AUTHOR_VERSION = 5.32.2
MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org>
PACKAGE = cc-mode
https://bitbucket.org/xemacs/cc-mode/commits/fbbd5245fbdc/
Changeset: fbbd5245fbdc
User: Norbert Koch
Date: 2013-09-19 10:01:53
Summary: Added tag cc-mode-1_70 for changeset e4b17748254e
Affected #: 1 file
diff -r e4b17748254e2efd679b7f2bcc92c6f7e0204ae1 -r fbbd5245fbdc4d5ceed93b22be13f47fa78d48a2 .hgtags
--- a/.hgtags
+++ b/.hgtags
＠＠ -101,3 +101,4 ＠＠
a0fb9e88becddf22e9e50cbca7009a46106f0cac cc-mode-1_67
30193171ee9f9ed46e44502a7b15f7064016ee5b cc-mode-1_68
d3c0d95369e48b69f82b52b69f2b6d77bf957c65 cc-mode-1_69
+e4b17748254e2efd679b7f2bcc92c6f7e0204ae1 cc-mode-1_70
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/cc-mode: acm: Fix fontification of type when followed by "const".
10 years, 7 months
Bitbucket
Bitbucket
1 new commit in cc-mode:
https://bitbucket.org/xemacs/cc-mode/commits/828f2446cd89/
Changeset: 828f2446cd89
User: acm
Date: 2013-09-18 22:21:36
Summary: Fix fontification of type when followed by "const".
cc-engine.el (c-forward-decl-or-cast-1): Don't exclude "known" types from
fontification.
Affected #: 1 file
diff -r 1bdd63c23b3dcf39b93f66655ccd457f515be41d -r 828f2446cd8992e30acc22881da5c7313fafb09b cc-engine.el
--- a/cc-engine.el
+++ b/cc-engine.el
＠＠ -7446,7 +7446,11 ＠＠
;; interactive refontification.
(c-put-c-type-property (point) 'c-decl-arg-start))
- (when (and c-record-type-identifiers at-type (not (eq at-type t)))
+ (when (and c-record-type-identifiers at-type ;; (not (eq at-type t))
+ ;; There seems no reason to exclude a token from
+ ;; fontification just because it's "a known type that can't
+ ;; be a name or other expression". 2013-09-18.
+ )
(let ((c-promote-possible-types t))
(save-excursion
(goto-char type-start)
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[COMMIT] Add mode-require-final-newline from GNU. Thanks GNU.
10 years, 7 months
The XEmacs Package Smoketest
The XEmacs Package Smoketest
Recent go-mode uses mode-require-final-newline which we don't have but
has been in GNU for years. Many more modes use this as well so we will
bump into this when syncing those modes so I added it.
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Mats Lidell <mats.lidell(a)cag.se>
# Date 1379282412 -7200
# Node ID 182d01410b8d6e21a3a4628839ffb34727de79a6
# Parent e88d026f39178b4f6098585a75b2a0ff4e751d9c
Add mode-require-final-newline from GNU. Thanks GNU.
lisp/ChangeLog:
2013-09-15 Mats Lidell <matsl(a)cxemacs.org>
* files.el (mode-require-final-newline): Variable synced from
GNU. Thank you GNU. Allows modes to control final newlines.
(require-final-newline): Add action on visiting and visiting or
saving in sync with GNU.
* text-mode.el (text-mode): Use mode-require-final-newline.
man/ChangeLog:
2013-09-15 Mats Lidell <matsl(a)xemacs.org>
* xemacs/files.texi (Saving): New variable
mode-require-final-newline. Update info for
require-final-newline.
tests/ChangeLog:
2013-09-15 Mats Lidell <matsl(a)xemacs.org>
* automated/files-tests.el: New file. Test new states in
require-final-newline and new variable
mode-require-final-newline.
diff -r e88d026f3917 -r 182d01410b8d lisp/ChangeLog
--- a/lisp/ChangeLog Sun Sep 15 23:50:20 2013 +0900
+++ b/lisp/ChangeLog Mon Sep 16 00:00:12 2013 +0200
＠＠ -1,3 +1,11 ＠＠
+2013-09-15 Mats Lidell <matsl(a)cxemacs.org>
+
+ * files.el (mode-require-final-newline): Variable synced from
+ GNU. Thank you GNU. Allows modes to control final newlines.
+ (require-final-newline): Add action on visiting and visiting or
+ saving in sync with GNU.
+ * text-mode.el (text-mode): Use mode-require-final-newline.
+
2013-09-10 Stephen J. Turnbull <stephen(a)xemacs.org>
* fontconfig.el (fc-name-parse-known-problem-attributes): New.
diff -r e88d026f3917 -r 182d01410b8d lisp/files.el
--- a/lisp/files.el Sun Sep 15 23:50:20 2013 +0900
+++ b/lisp/files.el Mon Sep 16 00:00:12 2013 +0200
＠＠ -1,6 +1,6 ＠＠
;;; files.el --- file input and output commands for XEmacs.
-;; Copyright (C) 1985-1987, 1992-1995, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992-1995, 1997, 2013 Free Software Foundation, Inc.
;; Copyright (C) 1995 Sun Microsystems.
;; Copyright (C) 2001, 2002, 2003 Ben Wing.
＠＠ -297,13 +297,46 ＠＠
:group 'backup)
(defcustom require-final-newline nil
- "*Value of t says silently ensure a file ends in a newline when it is saved.
-Non-nil but not t says ask user whether to add a newline when there isn't one.
-nil means don't add newlines."
-:type '(choice (const :tag "Off" nil)
- (const :tag "Add" t)
- (sexp :tag "Ask" :format "%t\n" ask))
-:group 'editing-basics)
+ "Whether to add a newline automatically at the end of the file.
+
+A value of t means do this only when the file is about to be saved.
+A value of `visit' means do this right after the file is visited.
+A value of `visit-save' means do it at both of those times.
+Any other non-nil value means ask user whether to add a newline, when saving.
+A value of nil means don't add newlines.
+
+Certain major modes set this locally to the value obtained
+from `mode-require-final-newline'."
+:type '(choice (const :tag "When visiting" visit)
+ (const :tag "When saving" t)
+ (const :tag "When visiting or saving" visit-save)
+ (const :tag "Don't add newlines" nil)
+ (other :tag "Ask each time" ask))
+:group 'editing-basics
+:version "21.5.35")
+
+(defcustom mode-require-final-newline t
+ "Whether to add a newline at end of file, in certain major modes.
+Those modes set `require-final-newline' to this value when you enable them.
+They do so because they are often used for files that are supposed
+to end in newlines, and the question is how to arrange that.
+
+A value of t means do this only when the file is about to be saved.
+A value of `visit' means do this right after the file is visited.
+A value of `visit-save' means do it at both of those times.
+Any other non-nil value means ask user whether to add a newline, when saving.
+
+A value of nil means do not add newlines. That is a risky choice in this
+variable since this value is used for modes for files that ought to have
+final newlines. So if you set this to nil, you must explicitly check and
+add a final newline, whenever you save a file that really needs one."
+:type '(choice (const :tag "When visiting" visit)
+ (const :tag "When saving" t)
+ (const :tag "When visiting or saving" visit-save)
+ (const :tag "Don't add newlines" nil)
+ (other :tag "Ask each time" ask))
+:group 'editing-basics
+:version "21.5.35")
(defcustom auto-save-default t
"*Non-nil says by default do auto-saving of every file-visiting buffer."
＠＠ -1576,6 +1609,16 ＠＠
; (when view-read-only
; (and-boundp 'view-mode (view-mode-disable)))
(normal-mode t)
+ ;; If requested, add a newline at the end of the file.
+ (and (memq require-final-newline '(visit visit-save))
+ (> (point-max) (point-min))
+ (/= (char-after (1- (point-max))) ?\n)
+ (not (and (eq selective-display t)
+ (= (char-after (1- (point-max))) ?\r)))
+ (not buffer-read-only)
+ (save-excursion
+ (goto-char (point-max))
+ (ignore-errors (insert "\n"))))
(when (and buffer-read-only
view-read-only
(not (eq (get major-mode 'mode-class) 'special)))
＠＠ -2833,6 +2876,7 ＠＠
(not (and (eq selective-display t)
(eq (char-after (1- (point-max))) ?\r)))
(or (eq require-final-newline t)
+ (eq require-final-newline 'visit-save)
(and require-final-newline
(y-or-n-p
(format "Buffer %s does not end in newline. Add one? "
diff -r e88d026f3917 -r 182d01410b8d lisp/text-mode.el
--- a/lisp/text-mode.el Sun Sep 15 23:50:20 2013 +0900
+++ b/lisp/text-mode.el Mon Sep 16 00:00:12 2013 +0200
＠＠ -1,6 +1,6 ＠＠
;;; text-mode.el --- text mode, and its idiosyncratic commands.
-;; Copyright (C) 1985, 1992, 1994, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1992, 1994, 1997, 2013 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp, dumped
＠＠ -83,6 +83,8 ＠＠
(setq paragraph-start (concat page-delimiter "\\|[ \t]*$"))
(make-local-variable 'paragraph-separate)
(setq paragraph-separate paragraph-start)
+ (set (make-local-variable 'require-final-newline)
+ mode-require-final-newline)
(setq mode-name "Text")
(setq major-mode 'text-mode)
(run-hooks 'text-mode-hook))
diff -r e88d026f3917 -r 182d01410b8d man/ChangeLog
--- a/man/ChangeLog Sun Sep 15 23:50:20 2013 +0900
+++ b/man/ChangeLog Mon Sep 16 00:00:12 2013 +0200
＠＠ -1,3 +1,8 ＠＠
+2013-09-15 Mats Lidell <matsl(a)xemacs.org>
+
+ * xemacs/files.texi (Saving): New variable
+ mode-require-final-newline. Update info for require-final-newline.
+
2013-06-25 Jerry James <james(a)xemacs.org>
* Makefile.in: New file, so we can replace ＠MAKEINFO＠.
diff -r e88d026f3917 -r 182d01410b8d man/xemacs/files.texi
--- a/man/xemacs/files.texi Sun Sep 15 23:50:20 2013 +0900
+++ b/man/xemacs/files.texi Mon Sep 16 00:00:12 2013 +0200
＠＠ -400,9 +400,24 ＠＠
＠xref{Interlocking,, Simultaneous Editing}.
＠vindex require-final-newline
- If the variable ＠code{require-final-newline} is non-＠code{nil}, Emacs
-puts a newline at the end of any file that doesn't already end in one,
-every time a file is saved or written.
+ If the value of the variable ＠code{require-final-newline} is
+＠code{t}, saving or writing a file silently puts a newline at the end
+if there isn't already one there. If the value is ＠code{visit}, Emacs
+adds a newline at the end of any file that doesn't have one, just
+after it visits the file. (This marks the buffer as modified, and you
+can undo it.) If the value is ＠code{visit-save}, Emacs adds such
+newlines both on visiting and on saving. If the value is ＠code{nil},
+Emacs leaves the end of the file unchanged; any other non-＠code{nil}
+value means to asks you whether to add a newline. The default is
+＠code{nil}.
+
+＠vindex mode-require-final-newline
+ Some major modes are designed for specific kinds of files that are
+always supposed to end in newlines. Such major modes set the variable
+＠code{require-final-newline} to the value of
+＠code{mode-require-final-newline}, which defaults to ＠code{t}. By
+setting the latter variable, you can control how these modes handle
+final newlines.
＠vindex write-file-hooks
＠vindex after-save-hook
diff -r e88d026f3917 -r 182d01410b8d tests/ChangeLog
--- a/tests/ChangeLog Sun Sep 15 23:50:20 2013 +0900
+++ b/tests/ChangeLog Mon Sep 16 00:00:12 2013 +0200
＠＠ -1,3 +1,8 ＠＠
+2013-09-15 Mats Lidell <matsl(a)xemacs.org>
+
+ * automated/files-tests.el: New file. Test new states in
+ require-final-newline and new variable mode-require-final-newline.
+
2013-09-10 Stephen J. Turnbull <stephen(a)xemacs.org>
* automated/process-tests.el: Should work on all POSIX systems.
diff -r e88d026f3917 -r 182d01410b8d tests/automated/files-tests.el
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/automated/files-tests.el Mon Sep 16 00:00:12 2013 +0200
＠＠ -0,0 +1,115 ＠＠
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Mats Lidell <matsl(a)xemacs.org>
+;; Maintainer:
+;; Created: 2013
+;; Keywords: tests
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Synched up with: Not in FSF.
+
+;;; Commentary:
+
+;; Test tag support.
+;; See test-harness.el for instructions on how to run these tests.
+
+(require 'test-harness)
+
+;; Require a newline on save
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline t))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline\n"))
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; Don't require a newline on save
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline"))
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; Require a newline on visit (not on save)
+;; Answer query when saving with both no and yes.
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (kill-buffer nil)
+ (let ((require-final-newline 'visit))
+ (find-file test-file-name)
+ (Assert (equal (buffer-string) "no newline\n"))
+
+ ;; Answer no
+ (erase-buffer)
+ (insert "no newline")
+ (flet ((y-or-n-p (prompt) nil))
+ (Silence-Message (save-buffer 0)))
+ (Assert (equal (buffer-string) "no newline"))
+
+ ;; Answer yes
+ (erase-buffer)
+ (insert "no newline")
+ (flet ((y-or-n-p (prompt) t))
+ (Silence-Message (save-buffer 0)))
+ (Assert (equal (buffer-string) "no newline\n")))
+
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; Require a newline on visit and save
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (kill-buffer nil)
+ (let ((require-final-newline 'visit-save))
+ (find-file test-file-name)
+ (Assert (equal (buffer-string) "no newline\n"))
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline\n")))
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; mode-require-final-newline is respected by text-mode
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil)
+ (mode-require-final-newline t))
+ (Assert (equal require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (text-mode)
+ (Assert (equal require-final-newline t))
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline\n"))
+ (kill-buffer nil)
+ (delete-file test-file-name))
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/XEmacs: matsl: Add mode-require-final-newline from GNU. Thanks GNU.
10 years, 7 months
Bitbucket
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/182d01410b8d/
Changeset: 182d01410b8d
User: matsl
Date: 2013-09-16 00:00:12
Summary: Add mode-require-final-newline from GNU. Thanks GNU.
lisp/ChangeLog:
2013-09-15 Mats Lidell <matsl(a)cxemacs.org>
* files.el (mode-require-final-newline): Variable synced from
GNU. Thank you GNU. Allows modes to control final newlines.
(require-final-newline): Add action on visiting and visiting or
saving in sync with GNU.
* text-mode.el (text-mode): Use mode-require-final-newline.
man/ChangeLog:
2013-09-15 Mats Lidell <matsl(a)xemacs.org>
* xemacs/files.texi (Saving): New variable
mode-require-final-newline. Update info for
require-final-newline.
tests/ChangeLog:
2013-09-15 Mats Lidell <matsl(a)xemacs.org>
* automated/files-tests.el: New file. Test new states in
require-final-newline and new variable
mode-require-final-newline.
Affected #: 7 files
diff -r e88d026f39178b4f6098585a75b2a0ff4e751d9c -r 182d01410b8d6e21a3a4628839ffb34727de79a6 lisp/ChangeLog
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
＠＠ -1,3 +1,11 ＠＠
+2013-09-15 Mats Lidell <matsl(a)cxemacs.org>
+
+ * files.el (mode-require-final-newline): Variable synced from
+ GNU. Thank you GNU. Allows modes to control final newlines.
+ (require-final-newline): Add action on visiting and visiting or
+ saving in sync with GNU.
+ * text-mode.el (text-mode): Use mode-require-final-newline.
+
2013-09-10 Stephen J. Turnbull <stephen(a)xemacs.org>
* fontconfig.el (fc-name-parse-known-problem-attributes): New.
diff -r e88d026f39178b4f6098585a75b2a0ff4e751d9c -r 182d01410b8d6e21a3a4628839ffb34727de79a6 lisp/files.el
--- a/lisp/files.el
+++ b/lisp/files.el
＠＠ -1,6 +1,6 ＠＠
;;; files.el --- file input and output commands for XEmacs.
-;; Copyright (C) 1985-1987, 1992-1995, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992-1995, 1997, 2013 Free Software Foundation, Inc.
;; Copyright (C) 1995 Sun Microsystems.
;; Copyright (C) 2001, 2002, 2003 Ben Wing.
＠＠ -297,13 +297,46 ＠＠
:group 'backup)
(defcustom require-final-newline nil
- "*Value of t says silently ensure a file ends in a newline when it is saved.
-Non-nil but not t says ask user whether to add a newline when there isn't one.
-nil means don't add newlines."
-:type '(choice (const :tag "Off" nil)
- (const :tag "Add" t)
- (sexp :tag "Ask" :format "%t\n" ask))
-:group 'editing-basics)
+ "Whether to add a newline automatically at the end of the file.
+
+A value of t means do this only when the file is about to be saved.
+A value of `visit' means do this right after the file is visited.
+A value of `visit-save' means do it at both of those times.
+Any other non-nil value means ask user whether to add a newline, when saving.
+A value of nil means don't add newlines.
+
+Certain major modes set this locally to the value obtained
+from `mode-require-final-newline'."
+:type '(choice (const :tag "When visiting" visit)
+ (const :tag "When saving" t)
+ (const :tag "When visiting or saving" visit-save)
+ (const :tag "Don't add newlines" nil)
+ (other :tag "Ask each time" ask))
+:group 'editing-basics
+:version "21.5.35")
+
+(defcustom mode-require-final-newline t
+ "Whether to add a newline at end of file, in certain major modes.
+Those modes set `require-final-newline' to this value when you enable them.
+They do so because they are often used for files that are supposed
+to end in newlines, and the question is how to arrange that.
+
+A value of t means do this only when the file is about to be saved.
+A value of `visit' means do this right after the file is visited.
+A value of `visit-save' means do it at both of those times.
+Any other non-nil value means ask user whether to add a newline, when saving.
+
+A value of nil means do not add newlines. That is a risky choice in this
+variable since this value is used for modes for files that ought to have
+final newlines. So if you set this to nil, you must explicitly check and
+add a final newline, whenever you save a file that really needs one."
+:type '(choice (const :tag "When visiting" visit)
+ (const :tag "When saving" t)
+ (const :tag "When visiting or saving" visit-save)
+ (const :tag "Don't add newlines" nil)
+ (other :tag "Ask each time" ask))
+:group 'editing-basics
+:version "21.5.35")
(defcustom auto-save-default t
"*Non-nil says by default do auto-saving of every file-visiting buffer."
＠＠ -1576,6 +1609,16 ＠＠
; (when view-read-only
; (and-boundp 'view-mode (view-mode-disable)))
(normal-mode t)
+ ;; If requested, add a newline at the end of the file.
+ (and (memq require-final-newline '(visit visit-save))
+ (> (point-max) (point-min))
+ (/= (char-after (1- (point-max))) ?\n)
+ (not (and (eq selective-display t)
+ (= (char-after (1- (point-max))) ?\r)))
+ (not buffer-read-only)
+ (save-excursion
+ (goto-char (point-max))
+ (ignore-errors (insert "\n"))))
(when (and buffer-read-only
view-read-only
(not (eq (get major-mode 'mode-class) 'special)))
＠＠ -2833,6 +2876,7 ＠＠
(not (and (eq selective-display t)
(eq (char-after (1- (point-max))) ?\r)))
(or (eq require-final-newline t)
+ (eq require-final-newline 'visit-save)
(and require-final-newline
(y-or-n-p
(format "Buffer %s does not end in newline. Add one? "
diff -r e88d026f39178b4f6098585a75b2a0ff4e751d9c -r 182d01410b8d6e21a3a4628839ffb34727de79a6 lisp/text-mode.el
--- a/lisp/text-mode.el
+++ b/lisp/text-mode.el
＠＠ -1,6 +1,6 ＠＠
;;; text-mode.el --- text mode, and its idiosyncratic commands.
-;; Copyright (C) 1985, 1992, 1994, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1992, 1994, 1997, 2013 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp, dumped
＠＠ -83,6 +83,8 ＠＠
(setq paragraph-start (concat page-delimiter "\\|[ \t]*$"))
(make-local-variable 'paragraph-separate)
(setq paragraph-separate paragraph-start)
+ (set (make-local-variable 'require-final-newline)
+ mode-require-final-newline)
(setq mode-name "Text")
(setq major-mode 'text-mode)
(run-hooks 'text-mode-hook))
diff -r e88d026f39178b4f6098585a75b2a0ff4e751d9c -r 182d01410b8d6e21a3a4628839ffb34727de79a6 man/ChangeLog
--- a/man/ChangeLog
+++ b/man/ChangeLog
＠＠ -1,3 +1,8 ＠＠
+2013-09-15 Mats Lidell <matsl(a)xemacs.org>
+
+ * xemacs/files.texi (Saving): New variable
+ mode-require-final-newline. Update info for require-final-newline.
+
2013-06-25 Jerry James <james(a)xemacs.org>
* Makefile.in: New file, so we can replace ＠MAKEINFO＠.
diff -r e88d026f39178b4f6098585a75b2a0ff4e751d9c -r 182d01410b8d6e21a3a4628839ffb34727de79a6 man/xemacs/files.texi
--- a/man/xemacs/files.texi
+++ b/man/xemacs/files.texi
＠＠ -400,9 +400,24 ＠＠
＠xref{Interlocking,, Simultaneous Editing}.
＠vindex require-final-newline
- If the variable ＠code{require-final-newline} is non-＠code{nil}, Emacs
-puts a newline at the end of any file that doesn't already end in one,
-every time a file is saved or written.
+ If the value of the variable ＠code{require-final-newline} is
+＠code{t}, saving or writing a file silently puts a newline at the end
+if there isn't already one there. If the value is ＠code{visit}, Emacs
+adds a newline at the end of any file that doesn't have one, just
+after it visits the file. (This marks the buffer as modified, and you
+can undo it.) If the value is ＠code{visit-save}, Emacs adds such
+newlines both on visiting and on saving. If the value is ＠code{nil},
+Emacs leaves the end of the file unchanged; any other non-＠code{nil}
+value means to asks you whether to add a newline. The default is
+＠code{nil}.
+
+＠vindex mode-require-final-newline
+ Some major modes are designed for specific kinds of files that are
+always supposed to end in newlines. Such major modes set the variable
+＠code{require-final-newline} to the value of
+＠code{mode-require-final-newline}, which defaults to ＠code{t}. By
+setting the latter variable, you can control how these modes handle
+final newlines.
＠vindex write-file-hooks
＠vindex after-save-hook
diff -r e88d026f39178b4f6098585a75b2a0ff4e751d9c -r 182d01410b8d6e21a3a4628839ffb34727de79a6 tests/ChangeLog
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
＠＠ -1,3 +1,8 ＠＠
+2013-09-15 Mats Lidell <matsl(a)xemacs.org>
+
+ * automated/files-tests.el: New file. Test new states in
+ require-final-newline and new variable mode-require-final-newline.
+
2013-09-10 Stephen J. Turnbull <stephen(a)xemacs.org>
* automated/process-tests.el: Should work on all POSIX systems.
diff -r e88d026f39178b4f6098585a75b2a0ff4e751d9c -r 182d01410b8d6e21a3a4628839ffb34727de79a6 tests/automated/files-tests.el
--- /dev/null
+++ b/tests/automated/files-tests.el
＠＠ -0,0 +1,115 ＠＠
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Mats Lidell <matsl(a)xemacs.org>
+;; Maintainer:
+;; Created: 2013
+;; Keywords: tests
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software: you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+;; for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Synched up with: Not in FSF.
+
+;;; Commentary:
+
+;; Test tag support.
+;; See test-harness.el for instructions on how to run these tests.
+
+(require 'test-harness)
+
+;; Require a newline on save
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline t))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline\n"))
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; Don't require a newline on save
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline"))
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; Require a newline on visit (not on save)
+;; Answer query when saving with both no and yes.
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (kill-buffer nil)
+ (let ((require-final-newline 'visit))
+ (find-file test-file-name)
+ (Assert (equal (buffer-string) "no newline\n"))
+
+ ;; Answer no
+ (erase-buffer)
+ (insert "no newline")
+ (flet ((y-or-n-p (prompt) nil))
+ (Silence-Message (save-buffer 0)))
+ (Assert (equal (buffer-string) "no newline"))
+
+ ;; Answer yes
+ (erase-buffer)
+ (insert "no newline")
+ (flet ((y-or-n-p (prompt) t))
+ (Silence-Message (save-buffer 0)))
+ (Assert (equal (buffer-string) "no newline\n")))
+
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; Require a newline on visit and save
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (kill-buffer nil)
+ (let ((require-final-newline 'visit-save))
+ (find-file test-file-name)
+ (Assert (equal (buffer-string) "no newline\n"))
+ (erase-buffer)
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline\n")))
+ (kill-buffer nil)
+ (delete-file test-file-name))
+
+;; mode-require-final-newline is respected by text-mode
+(let ((test-file-name (make-temp-file "files-tests"))
+ (require-final-newline nil)
+ (mode-require-final-newline t))
+ (Assert (equal require-final-newline nil))
+ (find-file test-file-name)
+ (erase-buffer)
+ (text-mode)
+ (Assert (equal require-final-newline t))
+ (insert "no newline")
+ (Silence-Message (save-buffer 0))
+ (Assert (equal (buffer-string) "no newline\n"))
+ (kill-buffer nil)
+ (delete-file test-file-name))
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[21.5R21.4] Make customize-variable on package-get-remote useful
10 years, 7 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5 RECOMMEND 21.4
Using customize on `package-get-remote' was hardly useful. This patch
makes it bearable. Only lightly tested so it could be more trouble
than it's worth.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 2 participants
- 1 comments
[21.5] Catch errors in FcNameParse
10 years, 7 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5
I mentioned in response to Marcus's patch for the vdb in darwin/x86_64
that I was still having problems. It turns out that for some reason
FcNameParse fails to parse certain fontconfig fontnames. I don't know
the root cause (I suspect a bug in fontconfig's parser for charset
objects but haven't confirmed -- FcNameParse usually is happy to just
ignore any part of the spec it can't handle). The attached patch may
be overkill; it's hard to imagine that users will be specifying
charsets by hand, and every other bogus spec I tried produced an
FcPattern. It's also very inefficient, but I don't notice any
difference (parsing filenames is unlikely to happen very often, and
the situation where I have actually used fc-name-parse-harder is
pretty rare).
On balance, I'm inclined to apply as-is. I will wait a few days for
contrary opinion.
Steve
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 3 participants
- 2 comments
[21.5] Tweak configure reporting
10 years, 7 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5
Will approve and commit shortly unless somebody dislikes it.
configure reports almost all of the information in Installation to
stdout at the end of the run. What's missing is the 'uname -a' output
and the configure arguments. This patch adds them to the stdout (and
keeps them in Installation, of course).
I'm doing this because I have a large collection of logs from
(./configure ... && make beta && make check), and I realized that it
doesn't have the exact configure command in it. The 'uname -a' output
might be useful in diagnosing build problems. This way I can be lazy
and not change my workflow to keep Installation versions. :-)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 1 comments
[21.5] Shut up clang
10 years, 7 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5
As usual, I'll give this a few days, then commit the lot.
Inspired by Jeff's Xkb patch, I cleaned up a bunch of warnings emitted
by clang (3.2--3.4beta versions) when XEmacs is built with
error-checkingx. With Jeff's patch, I now have zero warnings.
A lot of them are related to Jerry's recent (?) work on bignums (the
introduction of make_integer and friends). So Jerry, I'd appreciate
your opinion (some of them are a little ugly; mostly they appeal to me
as a very type-conscious hacker, but I'm not the one who maintains
that code, and the warnings related to make_integer and friends occur
because of bounds checks only in error-checking builds IIUC).
A generic comment: I believe we should avoid use of unsigned types,
almost at any cost. Careful analysis showed that the only use we have
for them is when external APIs use them. Then we should treat them
like legacy encodings, and convert them immediately to a Lisp type.
I left the unsigned integers in the code that deals with struct stat.
I don't understand the underlying APIs well enough to change it.
Steve
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 1 comments
[21.5] Run process tests on POSIX systems
10 years, 7 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5
Mats provided some process tests for Linux, but I think these should
work on most any POSIX system. The attached patch messes with the
header comment a bit, and then changes the "when linux" condition to
"unless windows-nt".
Comments welcome, especially from Mats as to why he specified "Linux"
rather than "not Windows native".
Will wait a few days for comments, then apply, and deal with buildbot
and beta tester fallout as it arises. I hope that sounds like a plan,
if not, let me know!
Steve
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 2 participants
- 4 comments