[AC21.5] Remove static qualifier from pdump_file_try()
12 years, 1 month
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
Recommended by Hans de Graaff of Gentoo and reviewed by Marcus
Crestani. Hans, Marcus, please check that I've done the right thing
here. I'll close issue 354 after confirmation, or Marcus can do it
since it's assigned to him.
Marcus, thanks for the review, and thanks to Aidan and Hans for the
analysis.
diff -r 70af4098e14f src/ChangeLog
--- a/src/ChangeLog Mon May 02 10:51:26 2011 +0100
+++ b/src/ChangeLog Tue May 03 01:42:33 2011 +0900
＠＠ -1,3 +1,8 ＠＠
+2011-05-03 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * dumper.c (pdump_file_try): Remove static qualifier.
+ Thanks to Hans de Graaff of Gentoo and Marcus Crestani.
+
2011-05-01 Aidan Kehoe <kehoea(a)parhasard.net>
* lread.c (parse_integer):
diff -r 70af4098e14f src/dumper.c
--- a/src/dumper.c Mon May 02 10:51:26 2011 +0100
+++ b/src/dumper.c Tue May 03 01:42:33 2011 +0900
＠＠ -2593,8 +2593,9 ＠＠
#endif /* !WIN32_NATIVE */
-
-static int
+/* This used to be static, but there seems to be a bug in the GCC 4.1.2
+ optimizer that clobbers exe_path. */
+int
pdump_file_try (Wexttext *exe_path)
{
Wexttext *w = exe_path + wext_strlen (exe_path);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 2 participants
- 1 comments
commit: Remove static qualifier from pdump_file_try.
12 years, 1 month
Stephen J. Turnbull
Stephen J. Turnbull
changeset: 5498:eb4eeec50f25
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Tue May 03 01:43:36 2011 +0900
files: src/ChangeLog src/dumper.c
description:
Remove static qualifier from pdump_file_try.
Thanks to Hans de Graaff of Gentoo and Marcus Crestani.
diff -r 70af4098e14f -r eb4eeec50f25 src/ChangeLog
--- a/src/ChangeLog Mon May 02 10:51:26 2011 +0100
+++ b/src/ChangeLog Tue May 03 01:43:36 2011 +0900
＠＠ -1,3 +1,8 ＠＠
+2011-05-03 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * dumper.c (pdump_file_try): Remove static qualifier.
+ Thanks to Hans de Graaff of Gentoo and Marcus Crestani.
+
2011-05-01 Aidan Kehoe <kehoea(a)parhasard.net>
* lread.c (parse_integer):
diff -r 70af4098e14f -r eb4eeec50f25 src/dumper.c
--- a/src/dumper.c Mon May 02 10:51:26 2011 +0100
+++ b/src/dumper.c Tue May 03 01:43:36 2011 +0900
＠＠ -2593,8 +2593,9 ＠＠
#endif /* !WIN32_NATIVE */
-
-static int
+/* This used to be static, but there seems to be a bug in the GCC 4.1.2
+ optimizer that clobbers exe_path. */
+int
pdump_file_try (Wexttext *exe_path)
{
Wexttext *w = exe_path + wext_strlen (exe_path);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Merge by hand with the changeset that backed out e82f5b7010fe.
12 years, 1 month
Aidan Kehoe
Aidan Kehoe
changeset: 5497:70af4098e14f
tag: tip
parent: 5495:1f0b15040456
parent: 5496:a7da359711ce
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Mon May 02 10:51:26 2011 +0100
files: man/ChangeLog man/Makefile man/doclicense.texi man/texinfo.tex man/texinfo/fdl.texi man/texinfo/texinfo.texi man/texinfo/version.texi
description:
Merge by hand with the changeset that backed out e82f5b7010fe.
man/ChangeLog addition:
2011-05-02 Aidan Kehoe <kehoea(a)parhasard.net>
* Makefile:
* texinfo.tex:
Merge by hand with the changeset that backed out e82f5b7010fe
(e82f5b7010fe is incompatible with deployed versions of makeinfo
as of today).
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Sync paragraphs.el to FSF 23.1.92
12 years, 1 month
Ben Wing
Ben Wing
changeset: 5493:f62141fe007d
user: Ben Wing <ben(a)xemacs.org>
date: Fri Feb 19 22:41:03 2010 -0600
files: lisp/ChangeLog lisp/paragraphs.el
description:
Sync paragraphs.el to FSF 23.1.92
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-19 Ben Wing <ben(a)xemacs.org>
* paragraphs.el:
* paragraphs.el (use-hard-newlines):
* paragraphs.el (paragraph-start):
* paragraphs.el (paragraph-separate):
* paragraphs.el (sentence-end-double-space):
* paragraphs.el (sentence-end-without-period):
* paragraphs.el (sentence-end-without-space): New.
* paragraphs.el (sentence-end):
* paragraphs.el (sentence-end-base): New.
* paragraphs.el (page-delimiter):
* paragraphs.el (paragraph-ignore-fill-prefix):
* paragraphs.el (forward-paragraph):
* paragraphs.el (backward-paragraph):
* paragraphs.el (mark-paragraph):
* paragraphs.el (forward-sentence):
* paragraphs.el (repunctuate-sentences): New.
Sync with FSF 23.1.92.
diff -r e82f5b7010fe -r f62141fe007d lisp/ChangeLog
--- a/lisp/ChangeLog Fri Feb 19 22:39:19 2010 -0600
+++ b/lisp/ChangeLog Fri Feb 19 22:41:03 2010 -0600
＠＠ -1,3 +1,23 ＠＠
+2010-02-19 Ben Wing <ben(a)xemacs.org>
+
+ * paragraphs.el:
+ * paragraphs.el (use-hard-newlines):
+ * paragraphs.el (paragraph-start):
+ * paragraphs.el (paragraph-separate):
+ * paragraphs.el (sentence-end-double-space):
+ * paragraphs.el (sentence-end-without-period):
+ * paragraphs.el (sentence-end-without-space): New.
+ * paragraphs.el (sentence-end):
+ * paragraphs.el (sentence-end-base): New.
+ * paragraphs.el (page-delimiter):
+ * paragraphs.el (paragraph-ignore-fill-prefix):
+ * paragraphs.el (forward-paragraph):
+ * paragraphs.el (backward-paragraph):
+ * paragraphs.el (mark-paragraph):
+ * paragraphs.el (forward-sentence):
+ * paragraphs.el (repunctuate-sentences): New.
+ Sync with FSF 23.1.92.
+
2010-02-08 Ben Wing <ben(a)xemacs.org>
* help.el (describe-function-1):
diff -r e82f5b7010fe -r f62141fe007d lisp/paragraphs.el
--- a/lisp/paragraphs.el Fri Feb 19 22:39:19 2010 -0600
+++ b/lisp/paragraphs.el Fri Feb 19 22:41:03 2010 -0600
＠＠ -1,17 +1,17 ＠＠
;;; paragraphs.el --- paragraph and sentence parsing
-;; Copyright (C) 1985, 86, 87, 91, 94, 95, 96, 1997, 1999, 2000, 2001
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985-87, 1991, 1994-97, 1999-2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010 Ben Wing.
;; Maintainer: FSF
;; Keywords: wp, dumped
;; 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 2, or (at your option)
-;; any later version.
+;; GNU Emacs 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
＠＠ -19,11 +19,10 ＠＠
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-;;; Synched up with: FSF 21.3.
+;;; Synced up with: FSF 23.1.92.
+;;; Synced by: Ben Wing, 2-17-10.
;;; Commentary:
＠＠ -41,6 +40,7 ＠＠
"Paragraph and sentence parsing."
:group 'editing)
+(put 'use-hard-newlines 'permanent-local t)
(define-minor-mode use-hard-newlines
"Minor mode to distinguish hard and soft newlines.
When active, the functions `newline' and `open-line' add the
＠＠ -104,6 +104,7 ＠＠
hard newline are considered to match."
:group 'paragraphs
:type 'regexp)
+(put 'paragraph-start 'safe-local-variable 'stringp)
;; paragraph-start requires a hard newline, but paragraph-separate does not:
;; It is assumed that paragraph-separate is distinctive enough to be believed
＠＠ -123,6 +124,7 ＠＠
text indented by a margin setting."
:group 'paragraphs
:type 'regexp)
+(put 'paragraph-separate 'safe-local-variable 'stringp)
(defcustom sentence-end-double-space t
"*Non-nil means a single space does not end a sentence.
＠＠ -132,55 +134,94 ＠＠
This variable applies only to filling, not motion commands. To
change the behavior of motion commands, see `sentence-end'.
-If you change this, you should also change `sentence-end'. See Info
-node `Sentences'."
+This value is used by the function `sentence-end' to construct the
+regexp describing the end of a sentence, when the value of the variable
+`sentence-end' is nil. See Info node `(lispref)Standard Regexps'."
:type 'boolean
:group 'fill)
+(put 'sentence-end-double-space 'safe-local-variable 'booleanp)
(defcustom sentence-end-without-period nil
"*Non-nil means a sentence will end without a period.
For example, a sentence in Thai text ends with double space but
-without a period."
+without a period.
+
+This value is used by the function `sentence-end' to construct the
+regexp describing the end of a sentence, when the value of the variable
+`sentence-end' is nil. See Info node `(lispref)Standard Regexps'."
:type 'boolean
:group 'fill)
+(put 'sentence-end-without-period 'safe-local-variable 'booleanp)
-(defcustom sentence-end
- (purecopy
- ;; This is a bit stupid since it's not auto-updated when the
- ;; other variables are changed, but it's still useful info.
- (concat (if sentence-end-without-period "\\w \\|")
- "[.?!"
- (if (featurep 'mule)
- (decode-coding-string "\033$B!#!%!)!*\033$A!##.#?#!\033$(0!$!%!)!*\033$(G!$!%!)!*\033(B" 'iso-2022-7bit)
- "")
- "][]\"')}]*"
- (if sentence-end-double-space
- "\\($\\| $\\|\t\\| \\)" "\\($\\|[\t ]\\)")
- "[ \t\n]*"))
- "*Regexp describing the end of a sentence.
+(defcustom sentence-end-without-space
+ (cond ((featurep 'unicode-internal)
+ (decode-coding-string "\343\200\202\357\274\216\357\274\237\357\274\201" 'utf-8))
+ ((featurep 'mule)
+ (decode-coding-string "\033$B!#!%!)!*\033$A!##.#?#!\033$(0!$!%!)!*\033$(G!$!%!)!*\033(B" 'iso-2022-7bit))
+ (t ""))
+ "String of characters that end sentence without following spaces.
+
+This value is used by the function `sentence-end' to construct the
+regexp describing the end of a sentence, when the value of the variable
+`sentence-end' is nil. See Info node `(lispref)Standard Regexps'."
+:group 'paragraphs
+:type 'string)
+(put 'sentence-end-without-space 'safe-local-variable 'stringp)
+
+(defcustom sentence-end nil
+ "Regexp describing the end of a sentence.
The value includes the whitespace following the sentence.
All paragraph boundaries also end sentences, regardless.
-The default value specifies that in order to be recognized as the end
-of a sentence, the ending period, question mark, or exclamation point
-must be followed by two spaces, unless it's inside some sort of quotes
-or parenthesis.
+The value nil means to use the default value defined by the
+function `sentence-end'. You should always use this function
+to obtain the value of this variable."
+:group 'paragraphs
+:type '(choice regexp (const :tag "Use default value" nil)))
+(put 'sentence-end 'safe-local-variable 'string-or-null-p)
-See also the variable `sentence-end-double-space', the variable
-`sentence-end-without-period' and Info node `Sentences'."
+(defcustom sentence-end-base "[.?!][]\"'”)}]*"
+ "Regexp matching the basic end of a sentence, not including following space."
:group 'paragraphs
-:type 'regexp)
+:type 'string
+:version "22.1")
+(put 'sentence-end-base 'safe-local-variable 'stringp)
+
+(defun sentence-end ()
+ "Return the regexp describing the end of a sentence.
+
+This function returns either the value of the variable `sentence-end'
+if it is non-nil, or the default value constructed from the
+variables `sentence-end-base', `sentence-end-double-space',
+`sentence-end-without-period' and `sentence-end-without-space'.
+
+The default value specifies that in order to be recognized as the
+end of a sentence, the ending period, question mark, or exclamation point
+must be followed by two spaces, with perhaps some closing delimiters
+in between. See Info node `(elisp)Standard Regexps'."
+ (or sentence-end
+ ;; We accept non-break space along with space.
+ (concat (if sentence-end-without-period "\\w[ \u00a0][ \u00a0]\\|")
+ "\\("
+ sentence-end-base
+ (if sentence-end-double-space
+ "\\($\\|[ \u00a0]$\\|\t\\|[ \u00a0][ \u00a0]\\)" "\\($\\|[\t \u00a0]\\)")
+ "\\|[" sentence-end-without-space "]+"
+ "\\)"
+ "[ \u00a0\t\n]*")))
(defcustom page-delimiter "^\014"
"*Regexp describing line-beginnings that separate pages."
:group 'paragraphs
:type 'regexp)
+(put 'page-delimiter 'safe-local-variable 'stringp)
(defcustom paragraph-ignore-fill-prefix nil
"*Non-nil means the paragraph commands are not affected by `fill-prefix'.
This is desirable in modes where blank lines are the paragraph delimiters."
:group 'paragraphs
:type 'boolean)
+(put 'paragraph-ignore-fill-prefix 'safe-local-variable 'booleanp)
(defun forward-paragraph (&optional arg)
"Move forward to end of paragraph.
＠＠ -192,6 +233,7 ＠＠
A paragraph end is the beginning of a line which is not part of the paragraph
to which the end of the previous line belongs, or the end of the buffer.
Returns the count of paragraphs left to move."
+ ;; #### MERGE! FSF Has (interactive "^p")
(interactive "_p") ; XEmacs
(or arg (setq arg 1))
(let* ((opoint (point))
＠＠ -267,6 +309,9 ＠＠
(not (looking-at parsep)))
(not (and (looking-at parstart)
(or (not use-hard-newlines)
+ ;; #### XEmacs: We've reversed
+ ;; the order of the following two --
+ ;; does it matter?
(get-text-property (1- start) 'hard)
(bobp)))))
(setq found-start nil)
＠＠ -333,17 +378,18 ＠＠
a negative argument ARG = -N means move forward N paragraphs.
A paragraph start is the beginning of a line which is a
-`first-line-of-paragraph' or which is ordinary text and follows a
-paragraph-separating line; except: if the first real line of a
+`paragraph-start' or which is ordinary text and follows a
+`paragraph-separate'ing line; except: if the first real line of a
paragraph is preceded by a blank line, the paragraph starts at that
blank line.
See `forward-paragraph' for more information."
+ ;; #### MERGE! FSF Has (interactive "^p")
(interactive "_p") ; XEmacs
(or arg (setq arg 1))
(forward-paragraph (- arg)))
-(defun mark-paragraph (&optional arg)
+(defun mark-paragraph (&optional arg allow-extend)
"Put point at beginning of this paragraph, mark at end.
The paragraph marked is the one that contains point or follows point.
＠＠ -355,11 +401,12 ＠＠
If this command is repeated, it marks the next ARG paragraphs after (or
before, if arg is negative) the ones already marked."
- (interactive "p")
+ (interactive "p\np")
(unless arg (setq arg 1))
(when (zerop arg)
(error "Cannot mark zero paragraphs"))
- (cond ((and (eq last-command this-command) (mark t))
+ (cond ((and allow-extend
+ (eq last-command this-command) (mark t))
(set-mark
(save-excursion
(goto-char (mark))
＠＠ -415,17 +462,22 ＠＠
(end-of-paragraph-text))))))
(defun forward-sentence (&optional arg)
- "Move forward to next `sentence-end'. With argument, repeat.
-With negative argument, move backward repeatedly to `sentence-beginning'.
+ "Move forward to next end of sentence. With argument, repeat.
+With negative argument, move backward repeatedly to start of sentence.
The variable `sentence-end' is a regular expression that matches ends of
-sentences. A paragraph boundary also terminates a sentence."
+sentences. Also, every paragraph boundary terminates sentences as well."
+ ;; #### MERGE! FSF Has (interactive "^p")
(interactive "_p") ; XEmacs
(or arg (setq arg 1))
- (let ((opoint (point)))
+ (let ((opoint (point))
+ (sentence-end (sentence-end)))
(while (< arg 0)
(let ((pos (point))
- (par-beg (save-excursion (start-of-paragraph-text) (point))))
+ ;; We used to use (start-of-paragraph-text), but this can
+ ;; prevent sentence-end from matching if it is anchored at
+ ;; BOL and the paragraph starts indented.
+ (par-beg (save-excursion (backward-paragraph) (point))))
(if (and (re-search-backward sentence-end par-beg t)
(or (< (match-end 0) pos)
(re-search-backward sentence-end par-beg t)))
＠＠ -444,9 +496,18 ＠＠
'void-function
"constrain-to-field not available; is xemacs-base installed?"))))
+(defun repunctuate-sentences ()
+ "Put two spaces at the end of sentences from point to the end of buffer.
+It works using `query-replace-regexp'."
+ (interactive)
+ (query-replace-regexp "\\([]\"')]?\\)\\([.?!]\\)\\([]\"')]?\\) +"
+ "\\1\\2\\3 "))
+
+
(defun backward-sentence (&optional arg)
"Move backward to start of sentence. With arg, do it arg times.
See `forward-sentence' for more information."
+ ;; #### MERGE! FSF Has (interactive "^p")
(interactive "_p") ; XEmacs
(or arg (setq arg 1))
(forward-sentence (- arg)))
＠＠ -488,8 +549,8 ＠＠
(interactive "*p")
(transpose-subr 'forward-sentence arg))
-;;; Local Variables:
-;;; coding: iso-2022-7bit
-;;; End:
+;; Local Variables:
+;; coding: utf-8
+;; End:
;;; paragraphs.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Merge some stuff in lib-src
12 years, 1 month
Ben Wing
Ben Wing
changeset: 5491:06dd936cde16
parent: 5030:422b4b4fb2a6
user: Ben Wing <ben(a)xemacs.org>
date: Fri Feb 19 22:13:17 2010 -0600
files: lib-src/ChangeLog lib-src/digest-doc.c lib-src/emacs.csh lib-src/hexl.c lib-src/sorted-doc.c lib-src/vcdiff
description:
Merge some stuff in lib-src
-------------------- ChangeLog entries follow: --------------------
lib-src/ChangeLog addition:
2010-02-19 Ben Wing <ben(a)xemacs.org>
* digest-doc.c:
* digest-doc.c (main):
* emacs.csh:
* hexl.c:
* hexl.c (Gabryelski):
* hexl.c (main):
* hexl.c (usage):
* sorted-doc.c:
* sorted-doc.c (fatal):
* sorted-doc.c (xstrdup):
* sorted-doc.c (main):
* vcdiff:
Merge up to FSF 23.1.92.
diff -r 422b4b4fb2a6 -r 06dd936cde16 lib-src/ChangeLog
--- a/lib-src/ChangeLog Thu Feb 11 19:33:50 2010 -0500
+++ b/lib-src/ChangeLog Fri Feb 19 22:13:17 2010 -0600
＠＠ -1,3 +1,19 ＠＠
+2010-02-19 Ben Wing <ben(a)xemacs.org>
+
+ * digest-doc.c:
+ * digest-doc.c (main):
+ * emacs.csh:
+ * hexl.c:
+ * hexl.c (Gabryelski):
+ * hexl.c (main):
+ * hexl.c (usage):
+ * sorted-doc.c:
+ * sorted-doc.c (fatal):
+ * sorted-doc.c (xstrdup):
+ * sorted-doc.c (main):
+ * vcdiff:
+ Merge up to FSF 23.1.92.
+
2010-02-11 Vin Shelton <acs(a)xemacs.org>
* winclient.c: Bump connection retries to 20 because some people
diff -r 422b4b4fb2a6 -r 06dd936cde16 lib-src/digest-doc.c
--- a/lib-src/digest-doc.c Thu Feb 11 19:33:50 2010 -0500
+++ b/lib-src/digest-doc.c Fri Feb 19 22:13:17 2010 -0600
＠＠ -1,20 +1,52 ＠＠
-/* Give this program DOCSTR.mm.nn as standard input
- and it outputs to standard output
- a file of nroff output containing the doc strings.
+/* Give this program DOC-mm.nn.oo as standard input and it outputs to
+ standard output a file of nroff output containing the doc strings.
- See also sorted-doc.c, which produces similar output
- but in texinfo format and sorted by function/variable name. */
+Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008, 2009, 2010 Free Software Foundation, Inc.
+
+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/>.
+
+
+See also sorted-doc.c, which produces similar output
+but in texinfo format and sorted by function/variable name. */
+
+/* Synced up with: GNU 23.1.92. */
+/* Synced by: Ben Wing, 2-17-10. */
#ifdef emacs
#include <config.h>
#endif
#include <stdio.h>
+#ifdef WIN32_NATIVE
+#include <fcntl.h> /* for O_BINARY */
+#include <io.h> /* for setmode */
+#endif
+
int
main (int argc, char **argv)
{
register int ch;
register int notfirst = 0;
+
+#ifdef WIN32_NATIVE
+ /* DOC is a binary file. */
+ if (!isatty (fileno (stdin)))
+ setmode (fileno (stdin), O_BINARY);
+#endif
printf (".TL\n");
printf ("Command Summary for XEmacs\n");
＠＠ -50,3 +82,6 ＠＠
}
return 0;
}
+
+/* arch-tag: 2ba2c9b0-4157-4eba-bd9f-967e3677e35f
+ (do not change this comment) */
diff -r 422b4b4fb2a6 -r 06dd936cde16 lib-src/emacs.csh
--- a/lib-src/emacs.csh Thu Feb 11 19:33:50 2010 -0500
+++ b/lib-src/emacs.csh Fri Feb 19 22:13:17 2010 -0600
＠＠ -1,25 +1,34 ＠＠
-# This defines a csh command named `edit' which resumes an
-# existing Emacs or starts a new one if none exists.
-# One way or another, any arguments are passed to Emacs to specify files
-# (provided you have loaded `resume.el').
-# - Michael DeCorte
+### emacs.csh
-# These are the possible values of $whichjob
-# 1 = new ordinary emacs (the -nw is so that it doesn't try to do X)
-# 2 = resume emacs
-# 3 = new emacs under X (-i is so that you get a reasonable icon)
-# 4 = resume emacs under X
-# 5 = new emacs under suntools
-# 6 = resume emacs under suntools
-# 7 = new emacs under X and suntools - doesn't make any sense, so use X
-# 8 = resume emacs under X and suntools - doesn't make any sense, so use X
+## Add legal notice if non-trivial amounts of code are added.
+
+## Author: Michael DeCorte
+
+### Commentary:
+
+# Synced up with: GNU 23.1.92.
+# Synced by: Ben Wing, 2-17-10.
+
+## This file is obsolete. Use emacsclient -a instead.
+
+## This defines a csh command named `edit' which resumes an
+## existing Emacs or starts a new one if none exists.
+## One way or another, any arguments are passed to Emacs to specify files
+## (provided you have loaded `resume.el').
+
+## These are the possible values of $whichjob
+## 1 = new ordinary emacs (the -nw is so that it doesn't try to do X)
+## 2 = resume emacs
+## 3 = new emacs under X (-i is so that you get a reasonable icon)
+## 4 = resume emacs under X
set EMACS_PATTERN="^\[[0-9]\] . Stopped ............ $EMACS"
alias edit 'set emacs_command=("emacs -nw \!*" "fg %emacs" "emacs -i \!* &"\
- "emacsclient \!* &" "emacstool \!* &" "emacsclient \!* &" "emacs -i \!* &"\
"emacsclient \!* &") ; \
jobs >! $HOME/.jobs; grep "$EMACS_PATTERN" < $HOME/.jobs >& /dev/null; \
＠ isjob = ! $status; \
＠ whichjob = 1 + $isjob + $?DISPLAY * 2 + $?WINDOW_PARENT * 4; \
test -S ~/.emacs_server && emacsclient \!* \
|| echo `pwd` \!* >! ~/.emacs_args && eval $emacs_command[$whichjob]'
+
+# arch-tag: 433d58df-15b9-446f-ad37-f0393e3a23d4
diff -r 422b4b4fb2a6 -r 06dd936cde16 lib-src/hexl.c
--- a/lib-src/hexl.c Thu Feb 11 19:33:50 2010 -0500
+++ b/lib-src/hexl.c Fri Feb 19 22:13:17 2010 -0600
＠＠ -1,6 +1,32 ＠＠
-/* Synched up with: FSF 19.28. */
+/* Convert files for Emacs Hexl mode.
+ Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2010 Ben Wing.
+Author: Keith Gabryelski
+(according to authors.el)
+
+This file is not considered part of XEmacs.
+
+This program 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.
+
+This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
+
+/* Synced up with: GNU 23.1.92. */
+/* Synced by: Ben Wing, 2-17-10. */
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdio.h>
#include <ctype.h>
＠＠ -37,25 +63,25 ＠＠
register long address;
char string[18];
FILE *fp;
-
+
progname = *argv++; --argc;
-
+
/*
- ** -hex hex dump
- ** -oct Octal dump
- ** -group-by-8-bits
- ** -group-by-16-bits
- ** -group-by-32-bits
- ** -group-by-64-bits
- ** -iso iso character set.
- ** -big-endian Big Endian
- ** -little-endian Little Endian
- ** -un || -de from hexl format to binary.
- ** -- End switch list.
- ** <filename> dump filename
- ** - (as filename == stdin)
- */
-
+ ** -hex hex dump
+ ** -oct Octal dump
+ ** -group-by-8-bits
+ ** -group-by-16-bits
+ ** -group-by-32-bits
+ ** -group-by-64-bits
+ ** -iso iso character set.
+ ** -big-endian Big Endian
+ ** -little-endian Little Endian
+ ** -un || -de from hexl format to binary.
+ ** -- End switch list.
+ ** <filename> dump filename
+ ** - (as filename == stdin)
+ */
+
while (*argv && *argv[0] == '-' && (*argv)[1])
{
/* A switch! */
＠＠ -117,7 +143,7 ＠＠
}
else
{
- (void) fprintf (stderr, "%s: invalid switch: \"%s\".\n", progname,
+ fprintf (stderr, "%s: invalid switch: \"%s\".\n", progname,
*argv);
usage ();
}
＠＠ -145,7 +171,8 ＠＠
char buf[18];
#ifdef WIN32_NATIVE
- _setmode (_fileno (stdout), O_BINARY);
+ if (!isatty (_fileno (stdout)))
+ _setmode (_fileno (stdout), O_BINARY);
#endif
for (;;)
{
＠＠ -188,7 +215,8 ＠＠
else
{
#ifdef WIN32_NATIVE
- _setmode (_fileno (fp), O_BINARY);
+ if (!isatty (_fileno (stdout)))
+ _setmode (_fileno (stdout), O_BINARY);
#endif
address = 0;
string[0] = ' ';
＠＠ -210,7 +238,7 ＠＠
else
{
if (!i)
- (void) printf ("%08lx: ", address);
+ printf ("%08lx: ", address);
if (iso_flag)
string[i+1] =
＠＠ -218,7 +246,7 ＠＠
else
string[i+1] = (c < 0x20 || c >= 0x7F) ? '.' : c;
- (void) printf ("%02x", c);
+ printf ("%02x", c);
}
if ((i&group_by) == group_by)
＠＠ -237,15 +265,20 ＠＠
}
if (fp != stdin)
- (void) fclose (fp);
+ fclose (fp);
} while (*argv != NULL);
- return 0;
+ return EXIT_SUCCESS;
}
void
usage (void)
{
fprintf (stderr, "Usage: %s [-de] [-iso]\n", progname);
- exit (1);
+ exit (EXIT_FAILURE);
}
+
+/* arch-tag: 20e04fb7-926e-4e48-be86-64fe869ecdaa
+ (do not change this comment) */
+
+/* hexl.c ends here */
diff -r 422b4b4fb2a6 -r 06dd936cde16 lib-src/sorted-doc.c
--- a/lib-src/sorted-doc.c Thu Feb 11 19:33:50 2010 -0500
+++ b/lib-src/sorted-doc.c Fri Feb 19 22:13:17 2010 -0600
＠＠ -1,19 +1,42 ＠＠
-/* Give this program DOCSTR.mm.nn as standard input
- and it outputs to standard output
- a file of texinfo input containing the doc strings.
-
- This version sorts the output by function name.
- */
+/* Give this program DOC-mm.nn.oo as standard input and it outputs to
+ standard output a file of texinfo input containing the doc strings.
-/* Synched up with: FSF 19.28. */
+Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+This file is part of GNU Emacs.
+
+GNU Emacs 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.
+
+GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
+/* Synced up with: GNU 23.1.92. */
+/* Synced by: Ben Wing, 2-17-10. */
+
+/* This version sorts the output by function name. */
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h> /* for qsort() and malloc() */
#include <string.h>
static void *xmalloc (size_t);
+#ifdef WIN32_NATIVE
+#include <fcntl.h> /* for O_BINARY */
+#include <io.h> /* for setmode */
+#endif
#define NUL '\0'
#define MARKER '\037'
＠＠ -55,7 +78,7 ＠＠
fatal (char *s1, char *s2)
{
error (s1, s2);
- exit (1);
+ exit (EXIT_FAILURE);
}
/* Like malloc but get fatal error if memory is exhausted. */
＠＠ -70,11 +93,11 ＠＠
}
static char *
-strsav (char *str)
+xstrdup (char *str)
{
- char *buf = (char *) xmalloc (strlen (str) + 1);
- strcpy (buf, str);
- return buf;
+ char *buf = xmalloc (strlen (str) + 1);
+ (void) strcpy (buf, str);
+ return (buf);
}
/* Comparison function for qsort to call. */
＠＠ -104,13 +127,20 ＠＠
register DOCSTR *dp = NULL; /* allocated DOCSTR */
register LINE *lp = NULL; /* allocated line */
register char *bp = 0; /* ptr inside line buffer */
- /* int notfirst = 0; / * set after read something */
register enum state state = WAITING; /* state at start */
int cnt = 0; /* number of DOCSTRs read */
- DOCSTR *docs = 0; /* chain of allocated DOCSTRS */
+ DOCSTR *docs = NULL; /* chain of allocated DOCSTRS */
char buf[512]; /* line buffer */
-
+
+#ifdef DOS_NT
+ /* DOC is a binary file. */
+ if (!isatty (fileno (stdin)))
+ setmode (fileno (stdin), O_BINARY);
+#endif
+
+ bp = buf;
+
while (1) /* process one char at a time */
{
/* this char from the DOCSTR file */
＠＠ -158,7 +188,7 ＠＠
bp = buf;
state = DESC_GET;
}
-
+
/* process gets */
if (state == NAME_GET || state == DESC_GET)
＠＠ -170,7 +200,7 ＠＠
else /* saving and changing state */
{
*bp = NUL;
- bp = strsav (buf);
+ bp = xstrdup (buf);
if (state == NAME_GET)
dp->name = bp;
＠＠ -205,10 +235,13 ＠＠
printf ("\\input texinfo ＠c -*-texinfo-*-\n");
printf ("＠setfilename ../info/summary\n");
printf ("＠settitle Command Summary for XEmacs\n");
+ printf ("＠finalout\n");
printf ("＠unnumbered Command Summary for XEmacs\n");
printf ("＠table ＠asis\n");
printf ("\n");
printf ("＠iftex\n");
+ /* #### XEmacs note: FSF 23.1.92 is missing the = sign below.
+ Which is correct? */
printf ("＠global＠let＠ITEM=＠item\n");
printf ("＠def＠item{＠filbreak＠vskip5pt＠ITEM}\n");
printf ("＠font＠tensy cmsy10 scaled ＠magstephalf\n");
＠＠ -246,12 +279,20 ＠＠
putchar ('\n');
}
printf("＠end display\n");
- if ( i%200 == 0 && i != 0 ) printf("＠end table\n\n＠table ＠asis\n");
+ /* Try to avoid a save size overflow in the TeX output
+ routine. */
+ if (i%100 == 0 && i > 0 && i != cnt)
+ printf("\n＠end table\n＠table ＠asis\n");
}
printf ("＠end table\n");
printf ("＠bye\n");
}
- return 0;
+ return EXIT_SUCCESS;
}
+
+/* arch-tag: ce28f204-1e70-4b34-8210-3d54a5662071
+ (do not change this comment) */
+
+/* sorted-doc.c ends here */
diff -r 422b4b4fb2a6 -r 06dd936cde16 lib-src/vcdiff
--- a/lib-src/vcdiff Thu Feb 11 19:33:50 2010 -0500
+++ b/lib-src/vcdiff Fri Feb 19 22:13:17 2010 -0600
＠＠ -1,23 +1,43 ＠＠
-#!/bin/sh
-#
+#! /bin/sh
+
# Enhanced sccs diff utility for use with vc mode.
# This version is more compatible with rcsdiff(1).
-#
-# !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
-#
+
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+# Author: Paul Eggert
+# (according to authors.el)
+
+# 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/>.
+
# Modified by: vladimir(a)Eng.Sun.COM on 95-06-07
# * Made sure that file arguments are specifed as s.<filename>.
-# * Switched the assignments to $f inside the 3rd and 4th case statements of
-# the first for-loop
-# * Removed the incorrect initialization of sid1 before the first for-loop.
-#
+
+# Synced up with: GNU 23.1.92.
+# Synced by: Ben Wing, 2-17-10.
+
DIFF="diff"
usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
-PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
+# Now that we use `sccs get' rather than just `get', we don't need this.
+# PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
-echo=
+echo="echo"
sid1= sid2=
for f
＠＠ -31,14 +51,14 ＠＠
echo=:;;
-r?*)
case $sid1 in
- -r*)
- sid2=$f
+ '')
+ sid1=$f
;;
*)
case $sid2 in
- ?*) echo "$usage" >&2; exit 2 ;;
+ ?*) echo "$usage" >&2; exit 2 ;;
esac
- sid1=$f
+ sid2=$f
;;
esac
;;
＠＠ -67,31 +87,32 ＠＠
for f
do
- s=2
-
- # For files under SCCS control, fixup the file name to be the s. filename
- if [ -d SCCS ]; then
- if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
- f="SCCS/s.$f"
- fi
- fi
+ s=2
+
+ # For files under SCCS control, fixup the file name to be the
+ # s. filename
+ if [ -d SCCS ]; then
+ if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
+ f="SCCS/s.$f"
+ fi
+ fi
case $f in
s.* | */s.*)
if
- rev1=/tmp/geta$$
- get -s -p -k $sid1 "$f" > $rev1 &&
+ rev1=`mktemp /tmp/geta.XXXXXXXX`
+ sccs get -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
;;
*)
- rev2=/tmp/getb$$
- get -s -p -k $sid2 "$f" > $rev2
+ rev2=`mktemp /tmp/getb.XXXXXXXX`
+ sccs get -s -p -k $sid2 "$f" > $rev2
workfile=$rev2
esac
then
- $echo $DIFF $options $sid1 $sid2 $workfile >&2
+ $echo $DIFF $options $rev1 $workfile >&2
$DIFF $options $rev1 $workfile
s=$?
fi
＠＠ -104,3 +125,5 ＠＠
then status=$s
fi
done
+
+# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit: Import special-mode from GNU Emacs.
12 years, 1 month
Didier Verna
Didier Verna
changeset: 5487:dc37764a105b
tag: tip
user: Didier Verna <didier(a)lrde.epita.fr>
date: Sat Apr 30 17:29:47 2011 +0200
files: lisp/ChangeLog lisp/dumped-lisp.el lisp/special-mode.el
description:
Import special-mode from GNU Emacs.
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2011-04-30 Didier Verna <didier(a)xemacs.org>
* special-mode.el: New file.
* special-mode.el (special-mode-map): New variable.
* special-mode.el (special-mode): New function.
* dumped-lisp.el (preloaded-file-list): Add special-mode.
diff -r 58e320bde005 -r dc37764a105b lisp/ChangeLog
--- a/lisp/ChangeLog Sat Apr 30 13:30:47 2011 +0900
+++ b/lisp/ChangeLog Sat Apr 30 17:29:47 2011 +0200
＠＠ -1,3 +1,10 ＠＠
+2011-04-30 Didier Verna <didier(a)xemacs.org>
+
+ * special-mode.el: New file.
+ * special-mode.el (special-mode-map): New variable.
+ * special-mode.el (special-mode): New function.
+ * dumped-lisp.el (preloaded-file-list): Add special-mode.
+
2011-04-30 Stephen J. Turnbull <stephen(a)xemacs.org>
* faces.el (face-property-matching-instance):
diff -r 58e320bde005 -r dc37764a105b lisp/dumped-lisp.el
--- a/lisp/dumped-lisp.el Sat Apr 30 13:30:47 2011 +0900
+++ b/lisp/dumped-lisp.el Sat Apr 30 17:29:47 2011 +0200
＠＠ -118,6 +118,7 ＠＠
"easy-mmode" ; Added for 21.5. Used by help.
"help"
"easymenu" ; Added for 20.3.
+ "special-mode"
"lisp-mode"
"text-mode"
"fill"
diff -r 58e320bde005 -r dc37764a105b lisp/special-mode.el
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/special-mode.el Sat Apr 30 17:29:47 2011 +0200
＠＠ -0,0 +1,50 ＠＠
+;;; special-mode.el --- Special major mode to view specially formatted data
+
+;; Copyright (C) 2011 Didier Verna <didier(a)xemacs.org>
+
+;; Maintainer: Didier Verna <didier(a)xemacs.org>
+;; Keywords: dumped
+
+;; 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/>.
+
+;;; Commentary:
+
+;; This file is dumped with XEmacs.
+
+
+;;; Code:
+
+;; This code is imported from GNU Emacs 23.3.1 -- dvl
+
+(defvar special-mode-map
+ (let ((map (make-sparse-keymap)))
+ (suppress-keymap map)
+ (define-key map "q" 'quit-window)
+ (define-key map " " 'scroll-up)
+ (define-key map "\C-?" 'scroll-down)
+ (define-key map "?" 'describe-mode)
+ (define-key map ">" 'end-of-buffer)
+ (define-key map "<" 'beginning-of-buffer)
+ (define-key map "g" 'revert-buffer)
+ map))
+
+(put 'special-mode 'mode-class 'special)
+(define-derived-mode special-mode nil "Special"
+ "Parent major mode from which special major modes should inherit."
+ (setq buffer-read-only t))
+
+
+;;; special-mode.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 3 participants
- 5 comments
[COMMIT] Remove all autoload cookies from dumped files, they're needless and confusing.
12 years, 1 month
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1304268194 -3600
# Node ID 8861440b1aa49429c455f3b8cf78690678b1d8de
# Parent 159face738c3bfd6691d64cc235fa13fc84e61b5
Remove all autoload cookies from dumped files, they're needless and confusing.
lisp/ChangeLog addition:
2011-05-01 Aidan Kehoe <kehoea(a)parhasard.net>
* buff-menu.el (list-buffers-directory):
* buff-menu.el (default-list-buffers-identification):
* cus-file.el (custom-file-base):
* cus-file.el (custom-file):
* cus-file.el (make-custom-file-name):
* menubar.el (menu-split-long-menu):
* newcomment.el:
* newcomment.el (indent-for-comment):
* newcomment.el (comment-column):
* newcomment.el (comment-start):
* newcomment.el (comment-start-skip):
* newcomment.el (comment-end-skip):
* newcomment.el (comment-end):
* newcomment.el (comment-indent-function):
* newcomment.el (comment-style):
* newcomment.el (comment-padding):
* newcomment.el (comment-multi-line):
* newcomment.el (comment-normalize-vars):
* newcomment.el (comment-indent):
* newcomment.el (comment-set-column):
* newcomment.el (comment-kill):
* newcomment.el (uncomment-region):
* newcomment.el (comment-region):
* newcomment.el (comment-or-uncomment-region):
* newcomment.el (comment-dwim):
* newcomment.el (comment-indent-new-line):
* x-win-sun.el (x-win-init-sun):
* x-win-xfree86.el (x-win-init-xfree86):
* mule/mule-composite.el:
* mule/mule-composite.el (reference-point-alist):
* mule/mule-composite.el (compose-region):
* mule/mule-composite.el (decompose-region):
* mule/mule-composite.el (compose-string):
* mule/mule-composite.el (decompose-string):
* mule/mule-composite.el (compose-chars):
* mule/mule-composite.el (find-composition):
* mule/mule-composite.el (compose-chars-after):
* mule/mule-composite.el (compose-last-chars):
* mule/mule-composite.el (decompose-composite-char):
Remove all autoload cookies from dumped files, they're needless
and confusing.
diff -r 159face738c3 -r 8861440b1aa4 lisp/ChangeLog
--- a/lisp/ChangeLog Sun May 01 13:51:33 2011 +0100
+++ b/lisp/ChangeLog Sun May 01 17:43:14 2011 +0100
＠＠ -1,3 +1,47 ＠＠
+2011-05-01 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * buff-menu.el (list-buffers-directory):
+ * buff-menu.el (default-list-buffers-identification):
+ * cus-file.el (custom-file-base):
+ * cus-file.el (custom-file):
+ * cus-file.el (make-custom-file-name):
+ * menubar.el (menu-split-long-menu):
+ * newcomment.el:
+ * newcomment.el (indent-for-comment):
+ * newcomment.el (comment-column):
+ * newcomment.el (comment-start):
+ * newcomment.el (comment-start-skip):
+ * newcomment.el (comment-end-skip):
+ * newcomment.el (comment-end):
+ * newcomment.el (comment-indent-function):
+ * newcomment.el (comment-style):
+ * newcomment.el (comment-padding):
+ * newcomment.el (comment-multi-line):
+ * newcomment.el (comment-normalize-vars):
+ * newcomment.el (comment-indent):
+ * newcomment.el (comment-set-column):
+ * newcomment.el (comment-kill):
+ * newcomment.el (uncomment-region):
+ * newcomment.el (comment-region):
+ * newcomment.el (comment-or-uncomment-region):
+ * newcomment.el (comment-dwim):
+ * newcomment.el (comment-indent-new-line):
+ * x-win-sun.el (x-win-init-sun):
+ * x-win-xfree86.el (x-win-init-xfree86):
+ * mule/mule-composite.el:
+ * mule/mule-composite.el (reference-point-alist):
+ * mule/mule-composite.el (compose-region):
+ * mule/mule-composite.el (decompose-region):
+ * mule/mule-composite.el (compose-string):
+ * mule/mule-composite.el (decompose-string):
+ * mule/mule-composite.el (compose-chars):
+ * mule/mule-composite.el (find-composition):
+ * mule/mule-composite.el (compose-chars-after):
+ * mule/mule-composite.el (compose-last-chars):
+ * mule/mule-composite.el (decompose-composite-char):
+ Remove all autoload cookies from dumped files, they're needless
+ and confusing.
+
2011-04-30 Didier Verna <didier(a)xemacs.org>
* subr.el (looking-back): New function.
diff -r 159face738c3 -r 8861440b1aa4 lisp/buff-menu.el
--- a/lisp/buff-menu.el Sun May 01 13:51:33 2011 +0100
+++ b/lisp/buff-menu.el Sun May 01 17:43:14 2011 +0100
＠＠ -510,10 +510,7 ＠＠
(make-variable-buffer-local 'list-buffers-identification)
;; XEmacs
-;;;###autoload
(defvar list-buffers-directory nil)
-
-;;;###autoload
(make-variable-buffer-local 'list-buffers-directory)
;; #### not synched
diff -r 159face738c3 -r 8861440b1aa4 lisp/cus-file.el
--- a/lisp/cus-file.el Sun May 01 13:51:33 2011 +0100
+++ b/lisp/cus-file.el Sun May 01 17:43:14 2011 +0100
＠＠ -31,17 +31,14 ＠＠
;;; Code:
(provide 'cus-file)
-;;;###autoload
(defconst custom-file-base "custom.el"
"Base of file name for storing customization information.")
-;;;###autoload
(defvar custom-file nil
"File used for storing customization information.
If you change this from the default you need to
explicitly load that file for the settings to take effect.")
-;;;###autoload
(defun make-custom-file-name (init-file &optional force-new)
"Construct the default custom file name from the init file name.
If FORCE-NEW is non-nil, force post-migration location."
diff -r 159face738c3 -r 8861440b1aa4 lisp/menubar.el
--- a/lisp/menubar.el Sun May 01 13:51:33 2011 +0100
+++ b/lisp/menubar.el Sun May 01 17:43:14 2011 +0100
＠＠ -566,7 +566,6 ＠＠
accelerator specs -- this works even if the specs have already been added."
(menu-split-long-menu (menu-sort-menu menu)))
-;;;###autoload
(defun menu-split-long-menu (menu)
"Split MENU according to `menu-max-items' and add accelerator specs.
If MENU already has accelerator specs, they will be removed and new ones
diff -r 159face738c3 -r 8861440b1aa4 lisp/mule/mule-composite.el
--- a/lisp/mule/mule-composite.el Sun May 01 13:51:33 2011 +0100
+++ b/lisp/mule/mule-composite.el Sun May 01 17:43:14 2011 +0100
＠＠ -26,7 +26,6 ＠＠
;;; Code:
-;;;###autoload
(defconst reference-point-alist
'((tl . 0) (tc . 1) (tr . 2)
(Bl . 3) (Bc . 4) (Br . 5)
＠＠ -155,7 +154,6 ＠＠
(setq i (+ i 2))))
components)
-;;;###autoload
(defun compose-region (start end &optional components modification-func)
"UNIMPLEMENTED.
Compose characters in the current region.
＠＠ -193,7 +191,6 ＠＠
(compose-region-internal start end components modification-func)
(set-buffer-modified-p modified-p)))
-;;;###autoload
(defun decompose-region (start end)
"UNIMPLEMENTED.
Decompose text in the current region.
＠＠ -206,7 +203,6 ＠＠
(remove-text-properties start end '(composition nil))
(set-buffer-modified-p modified-p)))
-;;;###autoload
(defun compose-string (string &optional start end components modification-func)
"UNIMPLEMENTED.
Compose characters in string STRING.
＠＠ -232,14 +228,12 ＠＠
(compose-string-internal string start end components modification-func)
string)
-;;;###autoload
(defun decompose-string (string)
"UNIMPLEMENTED.
Return STRING where `composition' property is removed."
(remove-text-properties 0 (length string) '(composition nil) string)
string)
-;;;###autoload
(defun compose-chars (&rest args)
"UNIMPLEMENTED.
Return a string from arguments in which all characters are composed.
＠＠ -264,7 +258,6 ＠＠
(setq str (concat args)))
(compose-string-internal str 0 (length str) components)))
-;;;###autoload
(defun find-composition (pos &optional limit string detail-p)
"UNIMPLEMENTED.
Return information about a composition at or nearest to buffer position POS.
＠＠ -305,7 +298,6 ＠＠
result))
-;;;###autoload
(defun compose-chars-after (pos &optional limit object)
"UNIMPLEMENTED.
Compose characters in current buffer after position POS.
＠＠ -347,7 +339,6 ＠＠
(setq func nil tail (cdr tail)))))))
result))
-;;;###autoload
(defun compose-last-chars (args)
"UNIMPLEMENTED.
Compose last characters.
＠＠ -369,13 +360,12 ＠＠
(compose-region (- (point) chars) (point) (nth 2 args))
(compose-chars-after (- (point) chars) (point))))))
-;;;###autoload(global-set-key [compose-last-chars] 'compose-last-chars)
+;;;don't ###autoload(global-set-key [compose-last-chars] 'compose-last-chars)
;;; The following codes are only for backward compatibility with Emacs
;;; 20.4 and the earlier.
-;;;###autoload
(defun decompose-composite-char (char &optional type with-composition-rule)
"UNIMPLEMENTED.
Convert CHAR to string.
diff -r 159face738c3 -r 8861440b1aa4 lisp/newcomment.el
--- a/lisp/newcomment.el Sun May 01 13:51:33 2011 +0100
+++ b/lisp/newcomment.el Sun May 01 17:43:14 2011 +0100
＠＠ -64,13 +64,9 ＠＠
;;; Code:
-;;;###autoload
(defalias 'indent-for-comment 'comment-indent)
-;;;###autoload
(defalias 'set-comment-column 'comment-set-column)
-;;;###autoload
(defalias 'kill-comment 'comment-kill)
-;;;###autoload
(defalias 'indent-new-comment-line 'comment-indent-new-line)
(defgroup comment nil
＠＠ -90,7 +86,6 ＠＠
"Column to use for `comment-indent'. If nil, use `fill-column' instead."
:type '(choice (const nil) integer))
-;;;###autoload
(defcustom comment-column 32
"*Column to indent right-margin comments to.
Each mode establishes a different default value for this variable; you
＠＠ -100,26 +95,21 ＠＠
:type 'integer)
(make-variable-buffer-local 'comment-column)
-;;;###autoload
(defvar comment-start nil
"*String to insert to start a new comment, or nil if no comment syntax.")
-;;;###autoload
(defvar comment-start-skip nil
"*Regexp to match the start of a comment plus everything up to its body.
If there are any \\(...\\) pairs, the comment delimiter text is held to begin
at the place matched by the close of the first pair.")
-;;;###autoload
(defvar comment-end-skip nil
"Regexp to match the end of a comment plus everything up to its body.")
-;;;###autoload
(defvar comment-end ""
"*String to insert to end a new comment.
Should be an empty string if comments are terminated by end-of-line.")
-;;;###autoload
(defvar comment-indent-function 'comment-indent-default
"Function to compute desired indentation for a comment.
This function is called with no args with point at the beginning of
＠＠ -168,7 +158,6 ＠＠
INDENT specifies that the `comment-start' markers should not be put at the
left margin but at the current indentation of the region to comment.")
-;;;###autoload
(defcustom comment-style 'plain
"*Style to be used for `comment-region'.
See `comment-styles' for a list of available styles."
＠＠ -176,7 +165,6 ＠＠
`(choice ,＠(mapcar (lambda (s) `(const ,(car s))) comment-styles))
'symbol))
-;;;###autoload
(defcustom comment-padding " "
"Padding string that `comment-region' puts between comment chars and text.
Can also be an integer which will be automatically turned into a string
＠＠ -186,7 +174,6 ＠＠
makes the comment easier to read. Default is 1. nil means 0."
:type '(choice string integer (const nil)))
-;;;###autoload
(defcustom comment-multi-line t ; XEmacs - this works well with adaptive fill
"*Non-nil means \\[indent-new-comment-line] should continue same comment
on new line, with no new terminator or starter.
＠＠ -208,7 +195,6 ＠＠
"Return the mirror image of string S, without any trailing space."
(comment-string-strip (concat (nreverse (string-to-list s))) nil t))
-;;;###autoload
(defun comment-normalize-vars (&optional noerror)
(if (not comment-start) (or noerror (error "No comment syntax is defined"))
;; comment-use-syntax
＠＠ -431,7 +417,6 ＠＠
;;;; Commands
;;;;
-;;;###autoload
;; #### XEmacs had this: in place of just (current-column)
; (defconst comment-indent-function
＠＠ -460,7 +445,6 ＠＠
(and (> comment-add 0) (looking-at "\\s<\\S<")))
comment-column)))
-;;;###autoload
(defun comment-indent (&optional continue)
"Indent this line's comment to comment column, or insert an empty comment.
If CONTINUE is non-nil, use the `comment-continue' markers if any.
＠＠ -525,7 +509,6 ＠＠
(goto-char cpos)
(set-marker cpos nil))))
-;;;###autoload
(defun comment-set-column (arg)
"Set the comment column based on point.
With no ARG, set the comment column to the current column.
＠＠ -547,7 +530,6 ＠＠
(t (setq comment-column (current-column))
(lmessage 'command "Comment column set to %d" comment-column))))
-;;;###autoload
(defun comment-kill (arg)
"Kill the comment on this line, if any.
With prefix ARG, kill comments on that many lines starting with this one."
＠＠ -639,7 +621,6 ＠＠
(if multi (concat (regexp-quote (string c)) "*"))
(regexp-quote s))))))
-;;;###autoload
(defun uncomment-region (beg end &optional arg)
"Uncomment each line in the BEG .. END region.
The numeric prefix ARG can specify a number of chars to remove from the
＠＠ -870,7 +851,6 ＠＠
(end-of-line)
(not (or (eobp) (progn (forward-line) nil))))))))))
-;;;###autoload
(defun comment-region (beg end &optional arg)
"Comment or uncomment each line in the region.
With just \\[universal-argument] prefix arg, uncomment each line in region BEG .. END.
＠＠ -946,7 +926,6 ＠＠
(comment-region beg end (+ comment-add arg))))
-;;;###autoload
(defun comment-or-uncomment-region (beg end &optional arg)
"Call `comment-region', unless the region only consists of comments,
in which case call `uncomment-region'. If a prefix arg is given, it
＠＠ -959,7 +938,6 ＠＠
'uncomment-region 'comment-region)
beg end arg))
-;;;###autoload
(defun comment-dwim (arg)
"Call the comment command you want (Do What I Mean).
If the region is active and `transient-mark-mode' is on, call
＠＠ -1000,7 +978,6 ＠＠
(string-match (concat "\\`[ \t]*\\(?:" comment-start-skip "\\)")
fill-prefix)))
-;;;###autoload
(defun comment-indent-new-line (&optional soft)
"Break line at point and indent, continuing comment if within one.
This indents the body of the continued comment
diff -r 159face738c3 -r 8861440b1aa4 lisp/x-win-sun.el
--- a/lisp/x-win-sun.el Sun May 01 13:51:33 2011 +0100
+++ b/lisp/x-win-sun.el Sun May 01 17:43:14 2011 +0100
＠＠ -65,7 +65,6 ＠＠
(globally-declare-fboundp
'(x-keysym-on-keyboard-sans-modifiers-p))
-;;;###autoload
(defun x-win-init-sun (device)
;; help is ok
diff -r 159face738c3 -r 8861440b1aa4 lisp/x-win-xfree86.el
--- a/lisp/x-win-xfree86.el Sun May 01 13:51:33 2011 +0100
+++ b/lisp/x-win-xfree86.el Sun May 01 17:43:14 2011 +0100
＠＠ -42,7 +42,6 ＠＠
(globally-declare-fboundp
'(x-keysym-on-keyboard-p x-keysym-on-keyboard-sans-modifiers-p))
-;;;###autoload
(defun x-win-init-xfree86 (device)
;; We know this keyboard is an XFree86 keyboard. As such, we can predict
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments