[PATCH] arc-mode.el mini-sync, associate *.[ejw]ar
19 years, 2 months
Ville Skyttä
Ville Skyttä
Nothing terribly interesting here, this is just to add *.[ejw]ar to
auto-mode-alist, and to keep "synced with" up to date. There are more
interesting things in GNU Emacs >= 20.3 versions of the mode, but I
don't have time to port those right now.
Will commit tomorrow unless there are objections.
2005-01-29 Ville Skyttä <scop(a)xemacs.org>
* arc-mode.el: Sync with GNU Emacs 20.2, add *.[ejw]ar to
auto-mode-alist association.
- 1 participants
- 1 comments
FW: Extra CR's in CVS files
19 years, 2 months
Ben Wing
Ben Wing
The patches aren't terribly useful, but I've attached an example of one of
them.
ben
-----Original Message-----
From: Vin Shelton [mailto:acs＠xemacs.org]
Sent: Saturday, January 29, 2005 9:56 PM
To: Ben Wing
Subject: Re: Extra CR's in CVS files
"Ben Wing" <ben(a)666.com> writes:
> Vin -- some of the Windows-specific files in the 21.4 tree have CRLF
> sequences in the CVS files, which causes `cvs diff' to screw up quite
> often and find extraneous changes. This used to be a problem in 21.5
> as well but I've fixed it. I went ahead and fixed it in the
> nt/installer/Wise directory in 21.4; if you don't mind, I'll fix it in
> the other files it exists in as well.
>
> Ben
Ben,
Please post to xemacs-patches before committing.
Thanks,
Vin
- 1 participants
- 0 comments
Re: [joey@infodrom.org: Re: Emacs issue]
19 years, 2 months
Vin Shelton
Vin Shelton
Martin Schulze <joey(a)infodrom.org> writes:
> Our maintainer told me that you may be the proper person to contact.
>
> I propose to disclose this on February 10th.
>
> Regards,
>
> Joey
>
> ----- Forwarded message from Martin Schulze <joey(a)infodrom.org> -----
>
> Date: Wed, 26 Jan 2005 12:22:22 +0100
> From: Martin Schulze <joey(a)infodrom.org>
> To: "Stephen J. Turnbull" <stephen(a)xemacs.org>
> Cc: Debian Security Team <team(a)security.debian.org>
> Subject: Re: Emacs issue
> X-Folder: debian-security-private(a)lists.infodrom.org
>
> Stephen J. Turnbull wrote:
>> >>>>> "Martin" == Martin Schulze <joey(a)infodrom.org> writes:
>>
>> Martin> can I talk confidential to you about a security issue in
>> Martin> Emacs? Or could you tell me who I should talk to instead?
>>
>> If you mean XEmacs, you can start by writing to me, and I can tell you
>> who knows the most about whatever it is. If you mean GNU Emacs, or
>> Emacs in general, I would say write to rms(a)gnu.org.
>
> The problem exists in both, unfortunately. I'm also discussing
> this with Richard.
>
> Max Vozeler discovered several format string vulnerabilities in the
> movemail utility of Emacs. Via connecting to a malicious POP server
> an attacker can execute arbitrary code under the privileges of group
> mail (or worse if installed setuid root which is not the case for
> Debian at least).
>
> Max provided a patch for both Emacs and XEmacs. I'm attaching the
> one for XEmacs.
>
> CAN-2005-0100 was assigned to this issue.
>
> CAN-2004-nnnn a unique identifier for a vulnerability in a software
> package. The database behind this is maintained at MITRE's Common
> Vulnerabilities and Exposures project <http://cve.mitre.org/cve/>.
> Details for such an id are available after a few days of quarantaine
> at <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-nnnn>.
>
> Many vendors (both propriatery and Free Software) participate in this
> database and assign the id to vulnerability reports or updates they
> produce. These IDs help us security people generally for identifying
> if a given package is fixed or if a given update fixes which problem.
> Please mention this ID in the changelog and/or project announcements.
>
> I would like to discuss a disclosure date that will give vendors (I
> will get in touch with them) enough time to prepare updates. This
> should be in roughly two weeks. Would that be ok for you?
APPROVE COMMIT 21.4
Thanks for the patch, Joey. I have applied it to the 21.4 source tree
and it will appear in the soon-to-be-released XEmacs 21.4.17, "Jumbo
Shrimp".
I applied the following ChangeLog entry:
2005-01-29 Vin Shelton <acs(a)xemacs.org>
* movemail.c (popmail): Security fixes.
Thank you,
Vin Shelton
- 1 participants
- 0 comments
[COMMIT] cc-mode manual patch from Shyamal Prasad
19 years, 2 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
This should go into 21.4 as well.
man/ChangeLog addition:
2004-10-17 Shyamal Prasad <shyamal(a)member.fsf.org>
* xemacs/programs.texi (Program Modes): Updated it to reflect
current status of programming modes.
* xemacs/programs.texi (CC Mode): New section introduces CC
Mode. Introduces customization with reference to CC Mode
manual. Also introduce C/AWK modes in prog-modes package
* xemacs/programs.texi (C Ident): Removed - it was
obsolete. prog-modes package documentation now contains
indentation description for old C mode
* xemacs/major.texi (Mode Hooks): Add description of major mode
hooks. Cleaned up and updated programming mode descriptions.
* xemacs/xemacs.texi (Top): Updated Detailed Node listing for new
CC Mode section in programs.texi
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: man/xemacs/xemacs.texi man/xemacs/programs.texi man/xemacs/major.texi
cvs server: Diffing man
Index: man/xemacs/major.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/major.texi,v
retrieving revision 1.2
diff -u -p -r1.2 major.texi
--- man/xemacs/major.texi 1997/10/31 14:53:41 1.2
+++ man/xemacs/major.texi 2005/01/28 00:09:32
＠＠ -26,14 +26,15 ＠＠ which handle comments use the mode to de
Many major modes redefine the syntactical properties of characters
appearing in the buffer. ＠xref{Syntax}.
- The major modes fall into three major groups. Lisp mode (which has
-several variants), C mode, and Muddle mode are for specific programming
-languages. Text mode, Nroff mode, ＠TeX{} mode, and Outline mode are for
-editing English text. The remaining major modes are not intended for use
-on users' files; they are used in buffers created by Emacs for specific
-purposes and include Dired mode for buffers made by Dired (＠pxref{Dired}),
-Mail mode for buffers made by ＠kbd{C-x m} (＠pxref{Sending Mail}), and Shell
-mode for buffers used for communicating with an inferior shell process
+ The major modes fall into three major groups. Programming modes
+(＠pxref{Programs}) are for specific programming languages. Text modes
+(like Nroff mode, ＠TeX{} mode, Outline mode, XML mode, etc.＠:) are for
+editing human readable text. The remaining major modes are not intended
+for direct use in editing user files; they are used in buffers created
+by Emacs for specific purposes. Examples of such modes include Dired
+mode which is used for buffers made by Dired (＠pxref{Dired}), Mail mode
+for buffers made by ＠kbd{C-x m} (＠pxref{Sending Mail}), and Shell mode
+for buffers used for communicating with an inferior shell process
(＠pxref{Interactive Shell}).
Most programming language major modes specify that only blank lines
＠＠ -44,9 +45,10 ＠＠ in a program are usually indented. ＠xre
＠menu
* Choosing Modes:: How major modes are specified or chosen.
+* Mode Hooks:: Customizing a major mode
＠end menu
-＠node Choosing Modes,,Major Modes,Major Modes
+＠node Choosing Modes, Mode Hooks, Major Modes, Major Modes
＠section Choosing Major Modes
You can select a major mode explicitly for the current buffer, but
＠＠ -111,3 +113,49 ＠＠ specified by the variable ＠code{default-
value is the symbol ＠code{fundamental-mode}, which specifies Fundamental
mode. If ＠code{default-major-mode} is ＠code{nil}, the major mode is
taken from the previously selected buffer.
+
+＠node Mode Hooks, , Choosing Modes, Major Modes
+＠section Mode Hook Variables
+
+＠cindex Hook variables
+＠cindex mode hook
+＠findex add-hook
+＠findex remove-hook
+＠vindex lisp-mode-hook
+＠vindex emacs-lisp-mode-hook
+＠vindex lisp-interaction-mode-hook
+＠vindex scheme-mode-hook
+
+ The last step taken by a major mode, by convention, is to invoke a
+list of user supplied functions that are stored in a ``hook'' variable.
+This allows a user to further customize the major mode, and is
+particularly convenient for setting up buffer local variables
+(＠pxref{Locals}).
+
+ The name of the hook variable is created by appending the string
+＠code{-hook} to the name of the major mode. For example, the hook
+variable used by ＠code{text-mode} would be named ＠code{text-mode-hook}.
+By convention the mode hook function receives no arguments. If a hook
+variable does not exist, or it has the value ＠code{nil}, the major mode
+simply ignores it.
+
+ The recommended way to add functions to a hook variable is with the
+＠code{add-hook} function. For example, to automatically turn on the
+Auto Fill mode when Text mode is invoked the following code can be used in
+the initialization file (＠pxref{Init File})
+
+＠example
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+＠end example
+
+The ＠code{add-hook} function will check that the function is not already
+listed in the hook variable before adding it. It will also create a hook
+variable with the value ＠code{nil} if one does not exist before adding
+the function. ＠code{add-hook} adds functions to the front of the hook
+variable list. This means that the last hook added is run first by the
+major mode. It is considered very poor style to write hook functions
+that depend on the order that hooks are executed.
+
+Hooks can be removed from hook variables with ＠code{remove-hook}.
+
+
Index: man/xemacs/programs.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/programs.texi,v
retrieving revision 1.6
diff -u -p -r1.6 programs.texi
--- man/xemacs/programs.texi 2001/12/20 07:58:23 1.6
+++ man/xemacs/programs.texi 2005/01/28 00:09:33
＠＠ -1,14 +1,17 ＠＠
＠node Programs, Running, Text, Top
＠chapter Editing Programs
+＠cindex Programming Languages
＠cindex Lisp
-＠cindex C
- Emacs has many commands designed to understand the syntax of programming
-languages such as Lisp and C. These commands can:
+ XEmacs provides specialized support for editing source files for many
+different programming languages. For example it is possible to
＠itemize ＠bullet
＠item
+Follow the usual indentation conventions of the language
+(＠pxref{Grinding}).
+＠item
Move over or kill balanced expressions or ＠dfn{sexps} (＠pxref{Lists}).
＠item
Move over or mark top-level balanced expressions (＠dfn{defuns}, in Lisp;
＠＠ -18,8 +21,7 ＠＠ Show how parentheses balance (＠pxref{Mat
＠item
Insert, kill, or align comments (＠pxref{Comments}).
＠item
-Follow the usual indentation conventions of the language
-(＠pxref{Grinding}).
+Find functions and symbols in program by name (＠pxref{Tags}).
＠end itemize
The commands available for words, sentences, and paragraphs are useful in
＠＠ -52,6 +54,7 ＠＠ on the screen.
* Change Log:: Maintaining a change history for your program.
* Tags:: Go direct to any function in your program in one
command. Tags remembers which file it is in.
+* CC Mode:: Modes for C, C++, Java and similar languages
* Fortran:: Fortran mode and its special features.
* Asm Mode:: Asm mode and its special features.
＠end menu
＠＠ -60,24 +63,49 ＠＠ on the screen.
＠section Major Modes for Programming Languages
＠cindex Lisp mode
-＠cindex C mode
-＠cindex Scheme mode
- Emacs has several major modes for the programming languages Lisp, Scheme (a
-variant of Lisp), C, Fortran, and Muddle. Ideally, a major mode should be
-implemented for each programming language you might want to edit with
-Emacs; but often the mode for one language can serve for other
-syntactically similar languages. The language modes that exist are those
-that someone decided to take the trouble to write.
-
- There are several variants of Lisp mode, which differ in the way they
-interface to Lisp execution. ＠xref{Lisp Modes}.
-
- Each of the programming language modes defines the ＠key{TAB} key to run
-an indentation function that knows the indentation conventions of that
-language and updates the current line's indentation accordingly. For
-example, in C mode ＠key{TAB} is bound to ＠code{c-indent-line}. ＠key{LFD}
-is normally defined to do ＠key{RET} followed by ＠key{TAB}; thus it, too,
-indents in a mode-specific fashion.
+ Emacs has several major modes (＠pxref{Major Modes}) to support
+programming languages. These major modes will typically understand
+language syntax, provide automatic indentation features, syntax based
+highlighting of text, and will often provide interfaces to the
+programming environment to assist in compiling, executing and debugging
+programs.
+
+ A language mode exist when someone decides to take the trouble to
+write it. At this time many widely used programming languages are
+supported by XEmacs. Examples include Ada, Awk, C, C++, CORBA (IDL),
+Fortran, Java, Lisp, Modula 2, Objective-C, Perl, Pike, Prolog, Python,
+Ruby, Scheme, Simula, SQL, Tcl, Unix Shell scripts, and VHDL. Some of
+these language have seperate manuals, and some times more than one mode
+may be available for a language. For example, there are several
+variants of Lisp mode, which differ in the way they interface to Lisp
+execution. ＠xref{Lisp Modes}.
+
+ Major modes for programming language support are distributed in
+optional XEmacs packages (＠pxref{Packages}) that must be installed
+before use. A notable exception to this rule is that a Lisp Mode is
+integral to XEmacs. The Programming Mode Package (＠file{prog-modes})
+contains many such modes. Some languages are supported by packages of
+their own; prominent examples of such packages include ＠file{cc-mode}
+for C, C++, Java, Objective C etc.＠:, ＠file{python-modes} for Python,
+and ＠file{scheme} for Scheme.
+
+ For a language named ＠var{lang} the major mode for the language will
+typically be named ＠code{＠var{lang}-mode}. For example, the mode for C
+is called ＠code{c-mode}, that for Bourne shell scripts is called
+＠code{sh-mode} and so on. These modes will invoke the functions listed
+in the corresponding hook variables as a last step. ＠xref{Mode Hooks}.
+
+ A mode can be invoked by typing ＠kbd{M-x ＠var{lang}-mode
+＠key{RET}}. However this step is not normally required. If the package
+for a language mode is installed XEmacs usually knows when to
+automatically invoke the mode. This is normally done based on examining
+the file name to determine the language. ＠ref{Choosing Modes}.
+
+ Each of the programming language modes defines the ＠key{TAB} key to
+run an indentation function that knows the indentation conventions of
+that language and updates the current line's indentation accordingly.
+＠key{LFD} is normally defined to do ＠key{RET} followed by ＠key{TAB};
+thus it, too, indents in a mode-specific fashion.
＠kindex DEL
＠findex backward-delete-char-untabify
＠＠ -94,22 +122,6 ＠＠ blank lines, so that the paragraph comma
if enabled in a programming language major mode, indents the new lines
which it creates.
-＠cindex mode hook
-＠vindex c-mode-hook
-＠vindex lisp-mode-hook
-＠vindex emacs-lisp-mode-hook
-＠vindex lisp-interaction-mode-hook
-＠vindex scheme-mode-hook
-＠vindex muddle-mode-hook
- Turning on a major mode calls a user-supplied function called the
-＠dfn{mode hook}, which is the value of a Lisp variable. For example,
-turning on C mode calls the value of the variable ＠code{c-mode-hook} if
-that value exists and is non-＠code{nil}. Mode hook variables for other
-programming language modes include ＠code{lisp-mode-hook},
-＠code{emacs-lisp-mode-hook}, ＠code{lisp-interaction-mode-hook},
-＠code{scheme-mode-hook}, and ＠code{muddle-mode-hook}. The mode hook
-function receives no arguments.＠refill
-
＠node Lists, Defuns, Program Modes, Programs
＠section Lists and Sexps
＠＠ -198,13 +210,6 ＠＠ over them as well.
specified number of times; with a negative argument, it moves in the
opposite direction.
-In languages such as C where the comment-terminator can be recognized,
-the sexp commands move across comments as if they were whitespace. In
-Lisp and other languages where comments run until the end of a line, it
-is very difficult to ignore comments when parsing backwards; therefore,
-in such languages the sexp commands treat the text of comments as if it
-were code.
-
＠kindex C-M-k
＠findex kill-sexp
Killing an sexp at a time can be done with ＠kbd{C-M-k} (＠code{kill-sexp}).
＠＠ -338,7 +343,6 ＠＠ all of the lines inside a single parenth
* Basic Indent::
* Multi-line Indent:: Commands to reindent many lines at once.
* Lisp Indent:: Specifying how each Lisp function should be indented.
-* C Indent:: Choosing an indentation style for C code.
＠end menu
＠node Basic Indent, Multi-line Indent, Grinding, Grinding
＠＠ -434,7 +438,7 ＠＠ preprocessor lines when in C mode.
mark. The command ＠kbd{C-M-\} (＠code{indent-region}) applies ＠key{TAB}
to every line whose first character is between point and mark.
-＠node Lisp Indent, C Indent, Multi-line Indent, Grinding
+＠node Lisp Indent, , Multi-line Indent, Grinding
＠subsection Customizing Lisp Indentation
＠cindex customization
＠＠ -508,185 +512,7 ＠＠ indentation is computed by ＠kbd{C-M-q};
until the end of the list.
＠end table
-＠node C Indent, , Lisp Indent, Grinding
-＠subsection Customizing C Indentation
-
- Two variables control which commands perform C indentation and when.
-
-＠vindex c-auto-newline
- If ＠code{c-auto-newline} is non-＠code{nil}, newlines are inserted both
-before and after braces that you insert and after colons and semicolons.
-Correct C indentation is done on all the lines that are made this way.
-
-＠vindex c-tab-always-indent
- If ＠code{c-tab-always-indent} is non-＠code{nil}, the ＠key{TAB} command
-in C mode does indentation only if point is at the left margin or within
-the line's indentation. If there is non-whitespace to the left of point,
-＠key{TAB} just inserts a tab character in the buffer. Normally,
-this variable is ＠code{nil}, and ＠key{TAB} always reindents the current line.
-
- C does not have anything analogous to particular function names for which
-special forms of indentation are desirable. However, it has a different
-need for customization facilities: many different styles of C indentation
-are in common use.
-
- There are six variables you can set to control the style that Emacs C
-mode will use.
-
-＠table ＠code
-＠item c-indent-level
-Indentation of C statements within surrounding block. The surrounding
-block's indentation is the indentation of the line on which the
-open-brace appears.
-＠item c-continued-statement-offset
-Extra indentation given to a substatement, such as the then-clause of
-an ＠code{if} or body of a ＠code{while}.
-＠item c-brace-offset
-Extra indentation for lines that start with an open brace.
-＠item c-brace-imaginary-offset
-An open brace following other text is treated as if it were this far
-to the right of the start of its line.
-＠item c-argdecl-indent
-Indentation level of declarations of C function arguments.
-＠item c-label-offset
-Extra indentation for a line that is a label, case, or default.
-＠end table
-
-＠vindex c-indent-level
- The variable ＠code{c-indent-level} controls the indentation for C
-statements with respect to the surrounding block. In the example:
-
-＠example
- ＠{
- foo ();
-＠end example
-
-＠noindent
-the difference in indentation between the lines is ＠code{c-indent-level}.
-Its standard value is 2.
-
-If the open-brace beginning the compound statement is not at the beginning
-of its line, the ＠code{c-indent-level} is added to the indentation of the
-line, not the column of the open-brace. For example,
-
-＠example
-if (losing) ＠{
- do_this ();
-＠end example
-
-＠noindent
-One popular indentation style is that which results from setting
-＠code{c-indent-level} to 8 and putting open-braces at the end of a line
-in this way. Another popular style prefers to put the open-brace on a
-separate line.
-
-＠vindex c-brace-imaginary-offset
- In fact, the value of the variable ＠code{c-brace-imaginary-offset} is
-also added to the indentation of such a statement. Normally this variable
-is zero. Think of this variable as the imaginary position of the open
-brace, relative to the first non-blank character on the line. By setting
-the variable to 4 and ＠code{c-indent-level} to 0, you can get this style:
-
-＠example
-if (x == y) ＠{
- do_it ();
- ＠}
-＠end example
-
- When ＠code{c-indent-level} is zero, the statements inside most braces
-line up exactly under the open brace. An exception are braces in column
-zero, like those surrounding a function's body. The statements inside
-those braces are not placed at column zero. Instead,
-＠code{c-brace-offset} and ＠code{c-continued-statement-offset} (see
-below) are added to produce a typical offset between brace levels, and
-the statements are indented that far.
-
-＠vindex c-continued-statement-offset
- ＠code{c-continued-statement-offset} controls the extra indentation for
-a line that starts within a statement (but not within parentheses or
-brackets). These lines are usually statements inside other statements,
-like the then-clauses of ＠code{if} statements and the bodies of
-＠code{while} statements. The ＠code{c-continued-statement-offset}
-parameter determines the difference in indentation between the two lines in:
-
-＠example
-if (x == y)
- do_it ();
-＠end example
-
-＠noindent
-The default value for ＠code{c-continued-statement-offset} is 2. Some
-popular indentation styles correspond to a value of zero for
-＠code{c-continued-statement-offset}.
-
-＠vindex c-brace-offset
- ＠code{c-brace-offset} is the extra indentation given to a line that
-starts with an open-brace. Its standard value is zero;
-compare:
-
-＠example
-if (x == y)
- ＠{
-＠end example
-
-＠noindent
-with:
-
-＠example
-if (x == y)
- do_it ();
-＠end example
-
-＠noindent
-If you set ＠code{c-brace-offset} to 4, the first example becomes:
-
-＠example
-if (x == y)
- ＠{
-＠end example
-
-＠vindex c-argdecl-indent
- ＠code{c-argdecl-indent} controls the indentation of declarations of the
-arguments of a C function. It is absolute: argument declarations receive
-exactly ＠code{c-argdecl-indent} spaces. The standard value is 5 and
-results in code like this:
-＠example
-char *
-index (string, char)
- char *string;
- int char;
-＠end example
-
-＠vindex c-label-offset
- ＠code{c-label-offset} is the extra indentation given to a line that
-contains a label, a case statement, or a ＠code{default:} statement. Its
-standard value is ＠minus{}2 and results in code like this:
-
-＠example
-switch (c)
- ＠{
- case 'x':
-＠end example
-
-＠noindent
-If ＠code{c-label-offset} were zero, the same code would be indented as:
-
-＠example
-switch (c)
- ＠{
- case 'x':
-＠end example
-
-＠noindent
-This example assumes that the other variables above also have their
-default values.
-
-Using the indentation style produced by the default settings of the
-variables just discussed and putting open braces on separate lines
-produces clear and readable files. For an example, look at any of the C
-source files of XEmacs.
-
＠node Matching, Comments, Grinding, Programs
＠section Automatic Display of Matching Parentheses
＠cindex matching parentheses
＠＠ -1003,7 +829,7 ＠＠ Tue Jun 25 05:25:33 1985 Richard M. Sta
not displayed), set it again in final compute_motion.
＠end smallexample
-＠node Tags, Fortran, Change Log, Programs
+＠node Tags, CC Mode, Change Log, Programs
＠section Tags Tables
＠cindex tags table
＠＠ -1709,8 +1535,170 ＠＠ name recorded in the tags table contains
＠kbd{M-x tags-apropos} is like ＠code{apropos} for tags. It reads a regexp,
then finds all the tags in the selected tags table whose entries match that
regexp, and displays the tag names found.
+
+＠node CC Mode, Fortran, Tags, Programs
+＠section Modes for C, C++, Java and similar languages
+＠cindex C Mode
+＠cindex C++ Mode
+＠cindex Java Mode
+＠cindex AWK Mode
+＠cindex Objective C Mode
+＠cindex CORBA IDL Mode
+＠findex c-mode
+＠findex c++-mode
+＠findex java-mode
+＠findex idl-mode
+＠findex awk-mode
+＠findex pike-mode
+＠findex objc-mode
+＠vindex c-mode-hook
+＠vindex c++-mode-hook
+＠vindex java-mode-hook
+＠vindex idl-mode-hook
+＠vindex awk-mode-hook
+＠vindex pike-mode-hook
+＠vindex objc-mode-hook
+＠vindex c-mode-common-hook
+＠vindex c-initialization-hook
+
+ The recommended means for supporting the ``C--like'' programming
+languages in XEmacs is the ＠file{cc-mode} package. CC Mode is not
+included in the basic XEmacs distribution but is available as an
+optional package. If loading a file whose names ends in the ＠file{.cc}
+extension does not automatically invoke a C++ Mode then the
+＠file{cc-mode} package is probably not yet installed. ＠xref{Packages}.
+
+ CC Mode provides modes for editing source files in Awk
+(＠code{awk-mode}), C (＠code{c-mode}), C++ (＠code{c++-mode}), CORBA IDL
+(＠code{idl-mode}), Java (＠code{java-mode}), Objective C
+(＠code{objc-mode}), and Pike (＠code{pike-mode}). All these languages are
+supported with an sophisticated ``indentation engine'' that is feature
+rich, customizable and quite efficient.
+
+ Each language major mode runs hooks in the conventionally named hook
+variables (＠pxref{Mode Hooks}). In addition to this conventional
+behavior all the CC Mode major modes will also run hooks in
+＠code{c-mode-common-hook} ＠emph{before} invoking the major mode specific
+hook.
+
+ CC Mode runs any hooks in ＠code{c-initialization-hook} exactly once
+when it is first loaded.
+
+ CC Mode is a very comprehensive and flexible system and full
+description of its capabilities is beyond the scope of this manual. It
+is strongly recommended that the reader consult the CC Mode
+documentation for details once the package has been
+installed. ＠xref{Top,CC Mode,,cc-mode, The CC Mode Manual}.
+
+＠menu
+* Older Modes:: Older Modes for C and AWK
+* Customizing CC Mode:: An Introduction to Customizing CC Mode.
+＠end menu
+
+
+＠node Older Modes, Customizing CC Mode, CC Mode, CC Mode
+＠subsection Older Modes for C and AWK
+＠cindex Old C Mode
+＠cindex Old AWK Mode
+＠cindex C Mode without CC Mode
+＠cindex AWK Mode without CC Mode
+＠cindex old-c-mode
+
+ XEmacs provides older versions of a C Mode and an AWK Mode in the
+＠file{prog-modes} package. These older modes do not share the
+indentation engine in CC Mode have have their own specific means of
+customizing indentation. To use these modes the ＠file{prog-modes}
+package must be installed.
+
+ This older C mode is known simply as the ``Old C Mode''. It supports
+only the C language and it lacks many of the features of CC Mode.
+However the old C mode offers modest space requirements and very fast
+operation. Old C Mode might be useful in space constrained
+environments, on slow machines, or for editing very large files. This
+old C mode is available in the ＠file{old-c-mode}
+library. ＠xref{old-c-mode,Old C Mode,old-c-mode,prog-modes,The
+Programming Modes Package Manual}.
+
+ The old AWK mode exists for similar reasons. It is available in the
+＠file{awk-mode} library. ＠xref{awk-mode,Old AWK
+Mode,awk-mode,prog-modes,The Programming Modes Package Manual}.
+
+ Note that the prog-modes package will never automatically invoke these
+older modes for a user. However installing the ＠file{cc-mode} package
+＠emph{will} make CC Mode's versions available automatically. As a
+result a user who wants to use these older modes must explicitly load
+the old libraries to use them.
+
+＠node Customizing CC Mode, , Older Modes, CC Mode
+＠subsection Customizing Indentation in CC Mode
+
+ A very brief introduction is included here on customizing CC Mode. CC
+Mode has many features, including useful minor modes, that are
+completely documented in its own manual.
+
+ CC Mode implements several different ``styles'' for C code (and the
+other languages supported by CC Mode). If you need to change the
+indentation style for CC Mode it is recommended that you first see if an
+existing style meets your requirements. The style chosen will affect the
+placement of language elements like braces, function declarations and
+comments. You can choose a style interactively by typing ＠kbd{C-c .} and
+pressing the space bar at the prompt to get a list of supported
+styles. ＠kbd{C-c .} runs the function ＠code{c-set-style} which applies
+to all CC Mode language modes though its name might suggest otherwise. A
+few of the the supported styles are listed below.
+
+＠itemize ＠bullet
+＠item
+``gnu'' --- The recommeded style from the Free Software Foundation for
+GNU software.
+＠item
+``k&r'' --- The classic style from Kernighan and Ritchie.
+＠item
+``linux'' --- The style recommended for code in the Linux kernel.
+＠item
+``bsd'' --- The style recommended for software developed in BSD.
+＠item
+``java --- The ``traditional'' Java style.
+＠end itemize
+
+ The default style in XEmacs is ``gnu'' except for Java mode where it
+is the ``java'' style (this is governed by the variable
+＠code{c-default-style}).
+
+ The styles included in CC Mode all use a buffer local variable called
+＠code{c-basic-offset} as the basic indentation level (this buffer local
+variable is used in all CC Mode language modes though its name might
+suggest otherwise). All indentation is, by default, expressed in
+multiples of ＠code{c-basic-offset}.
+
+ Each style defines a default value for ＠code{c-basic-offset}, for the
+``gnu'' style sets it to 2. A very common customization scenario is
+where a user wants to use an existing style but with a different basic
+offset value. An easy way to do this is to set ＠code{c-basic-offset} in
+the language mode hook after selecting the chosen style.
+
+ For example, a user might want to follow a local coding convention of
+using the ``k&r'' style for C code with indentation in two columns
+multiples (instead of the five column default provided by the CC Mode
+``k&r'' style). This can be achieved with the following code in the
+initialization file (＠pxref{Init File})
+
+＠example
+(defun my-c-mode-hook ()
+ (c-set-style "k&r")
+ (setq c-basic-offset 2))
+(add-hook 'c-mode-hook 'my-c-mode-hook)
+＠end example
+
+ Most customizations for indentation in various CC modes can be
+accomplished by choosing a style and then choosing value for
+＠code{c-basic-offset} that meets the local coding convention. CC Mode
+has a very customizable indentation engine and a furthur discussion is
+really beyond the scope of this manual. ＠xref{Indentation
+Engine,,,cc-mode,The CC Mode Manual}.
+
-＠node Fortran, Asm Mode, Tags, Programs
+＠node Fortran, Asm Mode, CC Mode, Programs
＠section Fortran Mode
＠cindex Fortran mode
Index: man/xemacs/xemacs.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/xemacs.texi,v
retrieving revision 1.16
diff -u -p -r1.16 xemacs.texi
--- man/xemacs/xemacs.texi 2003/08/27 18:07:10 1.16
+++ man/xemacs/xemacs.texi 2005/01/28 00:09:34
＠＠ -472,6 +472,7 ＠＠ Editing Programs
* Change Log:: Maintaining a change history for your program.
* Tags:: Go directly to any function in your program in one
command. Tags remembers which file it is in.
+* CC Mode:: Modes for C, C++, Java and similar languages
* Fortran:: Fortran mode and its special features.
* Asm Mode:: Asm mode and its special features.
＠＠ -480,7 +481,6 ＠＠ Indentation for Programs
* Basic Indent::
* Multi-line Indent:: Commands to reindent many lines at once.
* Lisp Indent:: Specifying how each Lisp function should be indented.
-* C Indent:: Choosing an indentation style for C code.
Tags Tables
- 2 participants
- 1 comments
[ACp] Spelling fixes, document title for edit-utils doc
19 years, 2 months
Ville Skyttä
Ville Skyttä
APPROVE COMMIT packages
2005-01-29 Ville Skyttä <scop(a)xemacs.org>
* edit-utils.texi: Spelling fixes, add document title.
- 1 participants
- 0 comments
[ACp] Spelling fixes, document title for os-utils doc
19 years, 2 months
Ville Skyttä
Ville Skyttä
APPROVE COMMIT packages
2005-01-29 Ville Skyttä <scop(a)xemacs.org>
* os-utils.texi: Spelling fixes, add document title.
- 1 participants
- 0 comments
[COMMIT] Add backtrace when throwing past call_trapping_problems()
19 years, 2 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
src/ChangeLog addition:
2005-01-29 Ben Wing <ben(a)xemacs.org>
* alloc.c (garbage_collect_1):
* backtrace.h:
* bytecode.c (execute_rare_opcode):
* cmdloop.c:
* cmdloop.c (initial_command_loop):
* cmdloop.c (Frecursive_edit):
* cmdloop.c (call_command_loop):
* eval.c:
* eval.c (call_debugger):
* eval.c (Fcatch):
* eval.c (internal_catch):
* eval.c (throw_or_bomb_out):
* eval.c (condition_case_1):
* eval.c (maybe_get_trapping_problems_backtrace):
* eval.c (flagged_a_squirmer):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (call_trapping_problems):
* lisp.h:
* macros.c (Fexecute_kbd_macro):
Also include a backtrace when we catch an attempt to throw outside
of a function where call_trapping_problems() has been used.
docs-misc source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: src/macros.c src/lisp.h src/eval.c src/cmdloop.c src/bytecode.c src/backtrace.h src/alloc.c
cvs server: Diffing src
Index: src/alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.104
diff -u -p -r1.104 alloc.c
--- src/alloc.c 2005/01/24 23:33:46 1.104
+++ src/alloc.c 2005/01/29 09:07:22
＠＠ -4775,6 +4775,7 ＠＠ garbage_collect_1 (void)
mark_object (catch->tag);
mark_object (catch->val);
mark_object (catch->actual_tag);
+ mark_object (catch->backtrace);
}
}
Index: src/backtrace.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/backtrace.h,v
retrieving revision 1.10
diff -u -p -r1.10 backtrace.h
--- src/backtrace.h 2003/02/13 09:57:05 1.10
+++ src/backtrace.h 2005/01/29 09:07:22
＠＠ -141,6 +141,8 ＠＠ struct catchtag
/* Stores the actual tag used in `throw'; the same as TAG, unless
TAG is Vcatch_everything_tag. */
Lisp_Object actual_tag;
+ /* A backtrace prior to the throw, used with Vcatch_everything_tag. */
+ Lisp_Object backtrace;
Lisp_Object val;
struct catchtag *next;
struct gcpro *gcpro;
Index: src/bytecode.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/bytecode.c,v
retrieving revision 1.44
diff -u -p -r1.44 bytecode.c
--- src/bytecode.c 2005/01/24 23:33:47 1.44
+++ src/bytecode.c 2005/01/29 09:07:23
＠＠ -1377,7 +1377,7 ＠＠ execute_rare_opcode (Lisp_Object *stack_
case Bcatch:
{
Lisp_Object arg = POP;
- TOP = internal_catch (TOP, Feval, arg, 0, 0);
+ TOP = internal_catch (TOP, Feval, arg, 0, 0, 0);
break;
}
Index: src/cmdloop.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/cmdloop.c,v
retrieving revision 1.22
diff -u -p -r1.22 cmdloop.c
--- src/cmdloop.c 2004/09/20 19:19:35 1.22
+++ src/cmdloop.c 2005/01/29 09:07:23
＠＠ -1,6 +1,6 ＠＠
/* Editor command loop.
Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- Copyright (C) 1995, 1996, 2001, 2002 Ben Wing.
+ Copyright (C) 1995, 1996, 2001, 2002, 2003 Ben Wing.
This file is part of XEmacs.
＠＠ -290,7 +290,7 ＠＠ initial_command_loop (Lisp_Object load_m
Otherwise, this function will return normally when all command-
line arguments have been processed, the user's initialization
file has been read in, and the first frame has been created. */
- internal_catch (Qtop_level, top_level_1, Qnil, 0, 0);
+ internal_catch (Qtop_level, top_level_1, Qnil, 0, 0, 0);
/* If an error occurred during startup and the initial console
wasn't created, then die now (the error was already printed out
＠＠ -310,7 +310,7 ＠＠ initial_command_loop (Lisp_Object load_m
MARK_MODELINE_CHANGED;
/* Now invoke the command loop. It never returns; however, a
throw to 'top-level will place us at the end of this loop. */
- internal_catch (Qtop_level, command_loop_2, Qnil, 0, 0);
+ internal_catch (Qtop_level, command_loop_2, Qnil, 0, 0, 0);
/* #### wrong with selected-console? */
/* We don't actually call clear_echo_area() here, partially
at least because that runs Lisp code and it may be unsafe
＠＠ -373,7 +373,7 ＠＠ Alternately, `(throw 'exit t)' makes thi
specbind (Qstandard_output, Qt);
specbind (Qstandard_input, Qt);
- val = internal_catch (Qexit, command_loop_2, Qnil, 0, 0);
+ val = internal_catch (Qexit, command_loop_2, Qnil, 0, 0, 0);
if (EQ (val, Qt))
/* Turn abort-recursive-edit into a quit. */
＠＠ -440,8 +440,7 ＠＠ call_command_loop (Lisp_Object catch_err
if (NILP (catch_errors))
Fcommand_loop_1 ();
else
- internal_catch (Qtop_level,
- cold_load_command_loop, Qnil, 0, 0);
+ internal_catch (Qtop_level, cold_load_command_loop, Qnil, 0, 0, 0);
goto loop;
RETURN_NOT_REACHED (Qnil);
}
Index: src/eval.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v
retrieving revision 1.85
diff -u -p -r1.85 eval.c
--- src/eval.c 2005/01/24 23:33:51 1.85
+++ src/eval.c 2005/01/29 09:07:25
＠＠ -404,6 +404,7 ＠＠ static int throw_level;
#endif
static int warning_will_be_discarded (Lisp_Object level);
+static Lisp_Object maybe_get_trapping_problems_backtrace (void);
/************************************************************************/
＠＠ -526,7 +527,7 ＠＠ call_debugger (Lisp_Object arg)
max_specpdl_size = specpdl_size + 40;
speccount = internal_bind_int (&entering_debugger, 1);
- val = internal_catch (Qdebugger, call_debugger_259, arg, &threw, 0);
+ val = internal_catch (Qdebugger, call_debugger_259, arg, &threw, 0, 0);
return unbind_to_1 (speccount, ((threw)
? Qunbound /* Not returning a value */
＠＠ -1480,7 +1481,7 ＠＠ If a throw happens, it specifies the val
/* This function can GC */
Lisp_Object tag = Feval (XCAR (args));
Lisp_Object body = XCDR (args);
- return internal_catch (tag, Fprogn, body, 0, 0);
+ return internal_catch (tag, Fprogn, body, 0, 0, 0);
}
/* Set up a catch, then call C function FUNC on argument ARG.
＠＠ -1492,7 +1493,8 ＠＠ internal_catch (Lisp_Object tag,
Lisp_Object (*func) (Lisp_Object arg),
Lisp_Object arg,
int * volatile threw,
- Lisp_Object * volatile thrown_tag)
+ Lisp_Object * volatile thrown_tag,
+ Lisp_Object * volatile backtrace_before_throw)
{
/* This structure is made part of the chain `catchlist'. */
struct catchtag c;
＠＠ -1501,6 +1503,7 ＠＠ internal_catch (Lisp_Object tag,
c.next = catchlist;
c.tag = tag;
c.actual_tag = Qnil;
+ c.backtrace = Qnil;
c.val = Qnil;
c.backlist = backtrace_list;
#if 0 /* FSFmacs */
＠＠ -1521,6 +1524,7 ＠＠ internal_catch (Lisp_Object tag,
/* Throw works by a longjmp that comes right here. */
if (threw) *threw = 1;
if (thrown_tag) *thrown_tag = c.actual_tag;
+ if (backtrace_before_throw) *backtrace_before_throw = c.backtrace;
return c.val;
}
c.val = (*func) (arg);
＠＠ -1677,6 +1681,8 ＠＠ throw_or_bomb_out (Lisp_Object tag, Lisp
#endif
for (c = catchlist; c; c = c->next)
{
+ if (EQ (c->tag, Vcatch_everything_tag))
+ c->backtrace = maybe_get_trapping_problems_backtrace ();
if (EQ (c->tag, tag) || EQ (c->tag, Vcatch_everything_tag))
unwind_to_catch (c, val, tag);
}
＠＠ -1881,6 +1887,7 ＠＠ condition_case_1 (Lisp_Object handlers,
#endif
c.val = Qnil;
c.actual_tag = Qnil;
+ c.backtrace = Qnil;
c.backlist = backtrace_list;
#if 0 /* FSFmacs */
/* #### */
＠＠ -4813,19 +4820,13 ＠＠ struct call_trapping_problems
void *arg;
};
-static DECLARE_DOESNT_RETURN_TYPE
- (Lisp_Object, flagged_a_squirmer (Lisp_Object, Lisp_Object, Lisp_Object));
-
-static DOESNT_RETURN_TYPE (Lisp_Object)
-flagged_a_squirmer (Lisp_Object error_conditions, Lisp_Object data,
- Lisp_Object opaque)
+static Lisp_Object
+maybe_get_trapping_problems_backtrace (void)
{
- struct call_trapping_problems *p =
- (struct call_trapping_problems *) get_opaque_ptr (opaque);
+ Lisp_Object backtrace;
if (!(inhibit_flags & INHIBIT_WARNING_ISSUE)
- && !warning_will_be_discarded (current_warning_level ())
- && !EQ (error_conditions, Qquit))
+ && !warning_will_be_discarded (current_warning_level ()))
{
struct gcpro gcpro1;
Lisp_Object lstream = Qnil;
＠＠ -4842,15 +4843,32 ＠＠ flagged_a_squirmer (Lisp_Object error_co
lstream = make_resizing_buffer_output_stream ();
Fbacktrace (lstream, Qt);
Lstream_flush (XLSTREAM (lstream));
- p->backtrace = resizing_buffer_to_lisp_string (XLSTREAM (lstream));
+ backtrace = resizing_buffer_to_lisp_string (XLSTREAM (lstream));
Lstream_delete (XLSTREAM (lstream));
UNGCPRO;
unbind_to (speccount);
}
else
- p->backtrace = Qnil;
+ backtrace = Qnil;
+
+ return backtrace;
+}
+static DECLARE_DOESNT_RETURN_TYPE
+ (Lisp_Object, flagged_a_squirmer (Lisp_Object, Lisp_Object, Lisp_Object));
+
+static DOESNT_RETURN_TYPE (Lisp_Object)
+flagged_a_squirmer (Lisp_Object error_conditions, Lisp_Object data,
+ Lisp_Object opaque)
+{
+ struct call_trapping_problems *p =
+ (struct call_trapping_problems *) get_opaque_ptr (opaque);
+
+ if (!EQ (error_conditions, Qquit))
+ p->backtrace = maybe_get_trapping_problems_backtrace ();
+ else
+ p->backtrace = Qnil;
p->error_conditions = error_conditions;
p->data = data;
＠＠ -4891,11 +4909,11 ＠＠ issue_call_trapping_problems_warning (Li
{
Lisp_Object errstr =
emacs_sprintf_string_lisp
- ("%s: Attempt to throw outside of function "
- "to catch `%s' with value `%s'",
+ ("%s: Attempt to throw outside of function:"
+ "To catch `%s' with value `%s'\n\nBacktrace follows:\n\n%s",
Qnil, 3,
build_msg_string (warning_string ? warning_string : "error"),
- p->thrown_tag, p->thrown_value);
+ p->thrown_tag, p->thrown_value, p->backtrace);
warn_when_safe_lispobj (Qerror, current_warning_level (), errstr);
}
else if (p->caught_error && !EQ (p->error_conditions, Qquit))
＠＠ -5109,7 +5127,7 ＠＠ call_trapping_problems (Lisp_Object warn
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
struct call_trapping_problems package;
struct call_trapping_problems_result real_problem;
- Lisp_Object opaque, thrown_tag, tem;
+ Lisp_Object opaque, thrown_tag, tem, thrown_backtrace;
int thrown = 0;
assert (SYMBOLP (warning_class)); /* sanity-check */
＠＠ -5144,11 +5162,11 ＠＠ call_trapping_problems (Lisp_Object warn
after printing the warning. (We print the warning in the stack
context of the error, so we can get a backtrace.) */
tem = internal_catch (package.catchtag, call_trapping_problems_1, opaque,
- &thrown, &thrown_tag);
+ &thrown, &thrown_tag, &thrown_backtrace);
else if (flags & INTERNAL_INHIBIT_THROWS)
/* We skip over the first wrapper, which traps errors. */
tem = internal_catch (package.catchtag, call_trapping_problems_2, opaque,
- &thrown, &thrown_tag);
+ &thrown, &thrown_tag, &thrown_backtrace);
else
/* Nothing special. */
tem = (fun) (arg);
＠＠ -5182,7 +5200,7 ＠＠ call_trapping_problems (Lisp_Object warn
problem->caught_throw = 1;
problem->error_conditions = Qnil;
problem->data = Qnil;
- problem->backtrace = Qnil;
+ problem->backtrace = thrown_backtrace;
problem->thrown_tag = thrown_tag;
problem->thrown_value = tem;
}
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.120
diff -u -p -r1.120 lisp.h
--- src/lisp.h 2005/01/28 02:36:25 1.120
+++ src/lisp.h 2005/01/29 09:07:26
＠＠ -4158,6 +4158,7 ＠＠ Lisp_Object call_with_suspended_errors (
int proper_redisplay_wrapping_in_place (void);
Lisp_Object internal_catch (Lisp_Object, Lisp_Object (*) (Lisp_Object),
Lisp_Object, int * volatile,
+ Lisp_Object * volatile,
Lisp_Object * volatile);
Lisp_Object condition_case_1 (Lisp_Object,
Lisp_Object (*) (Lisp_Object),
Index: src/macros.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/macros.c,v
retrieving revision 1.13
diff -u -p -r1.13 macros.c
--- src/macros.c 2005/01/24 23:34:03 1.13
+++ src/macros.c 2005/01/29 09:07:27
＠＠ -278,7 +278,7 ＠＠ COUNT is a repeat count, or nil for once
executing_macro_index = 0;
con->prefix_arg = Qnil;
internal_catch (Qexecute_kbd_macro, call_command_loop,
- Qnil, 0, 0);
+ Qnil, 0, 0, 0);
}
while (--repeat != 0
&& (STRINGP (Vexecuting_macro) ||
cvs server: Diffing src/m
cvs server: Diffing src/s
- 1 participants
- 0 comments
[COMMIT] Fix recognition of coding magic cookie in autodetection
19 years, 2 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
src/ChangeLog addition:
2005-01-29 Ben Wing <ben(a)xemacs.org>
* file-coding.c (snarf_coding_system):
Use UExtbyte for semantic correctness.
* file-coding.c (look_for_coding_system_magic_cookie):
Fix code that recognizes ;;;###coding cookie.
docs-misc source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: src/file-coding.c
Index: src/file-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v
retrieving revision 1.42
diff -u -p -r1.42 file-coding.c
--- src/file-coding.c 2005/01/24 23:33:54 1.42
+++ src/file-coding.c 2005/01/29 09:04:30
＠＠ -3541,10 +3541,10 ＠＠ detected_coding_system (struct detection
blanks). If found, return it, otherwise nil. */
static Lisp_Object
-snarf_coding_system (const Ibyte *p, Bytecount len)
+snarf_coding_system (const UExtbyte *p, Bytecount len)
{
Bytecount n;
- Ibyte *name;
+ UExtbyte *name;
while (*p == ' ' || *p == '\t') p++, len--;
len = min (len, 1000);
＠＠ -3563,7 +3563,9 ＠＠ snarf_coding_system (const Ibyte *p, Byt
if (n > 0)
{
name[n] = '\0';
- return find_coding_system_for_text_file (intern_int (name), 0);
+ /* This call to intern_int() is OK because we already verified that
+ there are only ASCII characters in the string */
+ return find_coding_system_for_text_file (intern_int ((Ibyte *) name), 0);
}
return Qnil;
＠＠ -3598,6 +3600,7 ＠＠ look_for_coding_system_magic_cookie (con
{
const UExtbyte *p;
const UExtbyte *scan_end;
+ Bytecount cookie_len;
/* Look for initial "-*-"; mode line prefix */
for (p = data,
＠＠ -3639,20 +3642,26 ＠＠ look_for_coding_system_magic_cookie (con
break;
}
-#if 0
- /* #### Totally wrong as is, rewrite */
- /* Look for initial ;;;###coding system */
+ /* Look for ;;;###coding system */
+ cookie_len = LENGTH (";;;###coding system: ");
+
+ for (p = data,
+ scan_end = data + len - cookie_len;
+ p <= scan_end;
+ p++)
{
- Bytecount ind = fast_string_match (QScoding_system_cookie,
- data, Qnil, 0, len, 0, ERROR_ME_NOT,
- 1);
- if (ind >= 0)
- return
- snarf_coding_system (data + ind + LENGTH (";;;###coding system: "),
- len - ind - LENGTH (";;;###coding system: "));
+ if (*p == ';' && !memcmp (p, ";;;###coding system: ", cookie_len))
+ {
+ const UExtbyte *suffix;
+
+ p += cookie_len;
+ suffix = p;
+ while (suffix < scan_end && !isspace (*suffix))
+ suffix++;
+ return snarf_coding_system (p, suffix - p);
+ }
}
-#endif /* 0 */
return Qnil;
}
- 1 participants
- 0 comments
[PATCH] [21.4] Update config.inc.samp
19 years, 2 months
Ben Wing
Ben Wing
nt/ChangeLog addition:
2005-01-28 Ben Wing <ben(a)xemacs.org>
* config.inc.samp:
* config.inc.samp (PNG_DIR):
* config.inc.samp (MAKEINFO):
Update directory locations to correspond to current optional-libs.exe
and Cygwin makeinfo.
latest-stable source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: nt/config.inc.samp
Index: nt/config.inc.samp
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/config.inc.samp,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 config.inc.samp
--- nt/config.inc.samp 2002/08/20 11:36:14 1.2.2.2
+++ nt/config.inc.samp 2005/01/29 00:35:53
＠＠ -26,39 +26,58 ＠＠ HAVE_GTK=0
GTK_DIR=
############################################################################
+# Compiled-in features: graphics formats #
+############################################################################
+
+# Directory under which the optional libraries are placed. To make your
+# life easy, just grab http://ftp.xemacs.org/aux/optional-libs.exe
+# (a self-installing .ZIP) and unzip them into an appropriate directory
+# (by default, c:\src). This gets you precompiled versions of all of
+# the libraries below.
+OPTIONAL_LIBRARY_DIR=c:\src
# Set this to enable XPM support (virtually mandatory), and specify
-# the directory containing xpm.
+# the directory containing xpm. Get the library from
+# http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz.
HAVE_XPM=1
-XPM_DIR=c:\src\xpm-3.4k
+XPM_DIR=$(OPTIONAL_LIBRARY_DIR)\xpm-3.4k
-# Set this to enable GIF support.
+# Set this to enable GIF support (built-in).
HAVE_GIF=1
# Set this to enable PNG support (virtually mandatory), and specify
-# the directories containing png and zlib.
+# the directories containing png and zlib. Get the latest version from
+# ftp://ftp.uu.net/graphics/png/. NOTE: In order to compile libpng,
+# you will have to rename the zlib directory to just `zlib'. We don't
+# do that here so we can preserve the version number, like for the other
+# libraries.
HAVE_PNG=1
-PNG_DIR=c:\src\libpng-1.0.9
-ZLIB_DIR=c:\src\zlib
-
-# Set this to enable TIFF support, and specify the directory containing tiff.
-HAVE_TIFF=0
-TIFF_DIR=
+PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8
+ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.1
-# Set this to enable JPEG support, and specify the directory containing jpeg.
+# Set this to enable JPEG support (useful, but not necessary), and specify
+# the directory containing jpeg. Get the latest version from
+# ftp://ftp.uu.net/graphics/jpeg/.
HAVE_JPEG=1
-JPEG_DIR=c:\src\jpeg-6b
+JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-6b
+
+# Set this to enable TIFF support (not very important), and specify the
+# directory containing tiff. Get the latest version from
+# ftp://ftp.uu.net/graphics/tiff/.
+HAVE_TIFF=0
+TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7
-# Set this to enable XFace support, and specify the directory containing
-# compface.
+# Set this to enable XFace support (not very important), and specify the
+# directory containing compface. Get the library from
+# http://ftp.xemacs.org/aux/compface-1.5.tar.gz.
HAVE_XFACE=0
-COMPFACE_DIR=
+COMPFACE_DIR=$(OPTIONAL_LIBRARY_DIR)\compface-1.5.1
############################################################################
# Set this to specify the location of makeinfo. (If not set, XEmacs will
# attempt to use its built-in texinfo support when building info files.)
-MAKEINFO=c:\src\texinfo-4.0\makeinfo\makeinfo.exe
+MAKEINFO=c:\cygwin\bin\makeinfo.exe
############################################################################
- 2 participants
- 1 comments
[R21.4] Arnaud Giersch's patch for regex.c / fix Gnus infloop
19 years, 2 months
Stephen J. Turnbull
Stephen J. Turnbull
RECOMMEND 21.4
Not needed for 21.5 (it's already in 21.5; this has been a "forehead,
meet palm" experience :-P ).
This is Arnaud Giersch's patch to fix the Gnus infloop caused by my
errors in backporting the 21.5 shy groups code. Andrey, you were
looking at almost the right place! I'd appreciate it if you could
check, too, although Arnaud is surely looking at the same infloop that
you reported.
Besides being in 21.5 and theoretically correct, Arnaud says it fixes
the infloop for him. And it's a fencepost-like error, as I suggested.
I'm sure this is it, although I can't test easily.
This _might_ fix _some_ of the "wrong side of point" errors and so on:
they could be due to accessing stale match register data, which is
what this patch prevents. But I think some of those were previous to
application of the backport of 21.5's shy groups, so don't get your
hopes up too high.
Thanks, Arnaud! I've added the ChangeLog, interchanged the
initialization and the comment at the top of the block, and
regularized the whitespace with `indent-region' (it's all tabs, now).
Sorry, Arnaud, this will cause a conflict when you CVS update.
For reference purposes, here is the semantic content of the patch
(cvs diff -w src/regex.c).
| Index: src/regex.c
| ===================================================================
| RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
| retrieving revision 1.25.2.11
| diff -u -r1.25.2.11 regex.c
| --- src/regex.c 16 Jan 2005 02:38:58 -0000 1.25.2.11
| +++ src/regex.c 27 Jan 2005 08:15:23 -0000
| ＠＠ -4714,10 +4714,11 ＠＠
| succeed_label:
| DEBUG_PRINT1 ("Accepting match.\n");
|
| + {
| /* If caller wants register contents data back, fill REGS. */
| + int num_nonshy_regs = bufp->re_nsub + 1;
| if (regs && !bufp->no_sub)
| {
| - int num_nonshy_regs = bufp->re_nsub + 1;
| /* Have the register data arrays been allocated? */
| if (bufp->regs_allocated == REGS_UNALLOCATED)
| { /* No. So allocate them with malloc. We need one
| ＠＠ -4801,8 +4802,9 ＠＠
| have to change the API for this function to reflect that, and
| audit all callers. */
| if (regs && regs->num_regs > 0)
| - for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++)
| + for (mcnt = num_nonshy_regs; mcnt < regs->num_regs; mcnt++)
| regs->start[mcnt] = regs->end[mcnt] = -1;
| + }
|
| DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
| nfailure_points_pushed, nfailure_points_popped,
Here are the ChangeLog and Arnaud's patch:
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.89
diff -u -U0 -r1.290.2.89 ChangeLog
--- src/ChangeLog 25 Jan 2005 01:15:27 -0000 1.290.2.89
+++ src/ChangeLog 27 Jan 2005 08:13:58 -0000
＠＠ -0,0 +1,5 ＠＠
+2005-01-26 Arnaud Giersch <arnaud.giersch(a)free.fr>
+
+ * regex.c (re_match_2_internal):
+ Correctly initialize loop which clears uninitialized registers.
+
Index: src/regex.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.25.2.11
diff -u -r1.25.2.11 regex.c
--- src/regex.c 16 Jan 2005 02:38:58 -0000 1.25.2.11
+++ src/regex.c 27 Jan 2005 08:24:39 -0000
＠＠ -4714,58 +4714,59 ＠＠
succeed_label:
DEBUG_PRINT1 ("Accepting match.\n");
- /* If caller wants register contents data back, fill REGS. */
- if (regs && !bufp->no_sub)
- {
- int num_nonshy_regs = bufp->re_nsub + 1;
- /* Have the register data arrays been allocated? */
- if (bufp->regs_allocated == REGS_UNALLOCATED)
- { /* No. So allocate them with malloc. We need one
- extra element beyond `num_regs' for the `-1' marker
- GNU code uses. */
- regs->num_regs = MAX (RE_NREGS, num_nonshy_regs + 1);
- regs->start = TALLOC (regs->num_regs, regoff_t);
- regs->end = TALLOC (regs->num_regs, regoff_t);
- if (regs->start == NULL || regs->end == NULL)
- {
- FREE_VARIABLES ();
- return -2;
- }
- bufp->regs_allocated = REGS_REALLOCATE;
- }
- else if (bufp->regs_allocated == REGS_REALLOCATE)
- { /* Yes. If we need more elements than were already
- allocated, reallocate them. If we need fewer, just
- leave it alone. */
- if (regs->num_regs < num_nonshy_regs + 1)
- {
- regs->num_regs = num_nonshy_regs + 1;
- RETALLOC (regs->start, regs->num_regs, regoff_t);
- RETALLOC (regs->end, regs->num_regs, regoff_t);
- if (regs->start == NULL || regs->end == NULL)
- {
- FREE_VARIABLES ();
- return -2;
- }
- }
- }
- else
- {
- /* The braces fend off a "empty body in an else-statement"
- warning under GCC when assert expands to nothing. */
- assert (bufp->regs_allocated == REGS_FIXED);
- }
-
- /* Convert the pointer data in `regstart' and `regend' to
- indices. Register zero has to be set differently,
- since we haven't kept track of any info for it. */
- if (regs->num_regs > 0)
- {
- regs->start[0] = pos;
- regs->end[0] = (MATCHING_IN_FIRST_STRING
- ? ((regoff_t) (d - string1))
- : ((regoff_t) (d - string2 + size1)));
- }
+ {
+ /* If caller wants register contents data back, fill REGS. */
+ int num_nonshy_regs = bufp->re_nsub + 1;
+ if (regs && !bufp->no_sub)
+ {
+ /* Have the register data arrays been allocated? */
+ if (bufp->regs_allocated == REGS_UNALLOCATED)
+ { /* No. So allocate them with malloc. We need one
+ extra element beyond `num_regs' for the `-1' marker
+ GNU code uses. */
+ regs->num_regs = MAX (RE_NREGS, num_nonshy_regs + 1);
+ regs->start = TALLOC (regs->num_regs, regoff_t);
+ regs->end = TALLOC (regs->num_regs, regoff_t);
+ if (regs->start == NULL || regs->end == NULL)
+ {
+ FREE_VARIABLES ();
+ return -2;
+ }
+ bufp->regs_allocated = REGS_REALLOCATE;
+ }
+ else if (bufp->regs_allocated == REGS_REALLOCATE)
+ { /* Yes. If we need more elements than were already
+ allocated, reallocate them. If we need fewer, just
+ leave it alone. */
+ if (regs->num_regs < num_nonshy_regs + 1)
+ {
+ regs->num_regs = num_nonshy_regs + 1;
+ RETALLOC (regs->start, regs->num_regs, regoff_t);
+ RETALLOC (regs->end, regs->num_regs, regoff_t);
+ if (regs->start == NULL || regs->end == NULL)
+ {
+ FREE_VARIABLES ();
+ return -2;
+ }
+ }
+ }
+ else
+ {
+ /* The braces fend off a "empty body in an else-statement"
+ warning under GCC when assert expands to nothing. */
+ assert (bufp->regs_allocated == REGS_FIXED);
+ }
+
+ /* Convert the pointer data in `regstart' and `regend' to
+ indices. Register zero has to be set differently,
+ since we haven't kept track of any info for it. */
+ if (regs->num_regs > 0)
+ {
+ regs->start[0] = pos;
+ regs->end[0] = (MATCHING_IN_FIRST_STRING
+ ? ((regoff_t) (d - string1))
+ : ((regoff_t) (d - string2 + size1)));
+ }
/* Map over the NUM_NONSHY_REGS non-shy internal registers.
Copy each into the corresponding external register.
＠＠ -4788,21 +4789,22 ＠＠
}
} /* regs && !bufp->no_sub */
- /* If we have regs and the regs structure has more elements than
- were in the pattern, set the extra elements to -1. If we
- (re)allocated the registers, this is the case, because we
- always allocate enough to have at least one -1 at the end.
-
- We do this even when no_sub is set because some applications
- (XEmacs) reuse register structures which may contain stale
- information, and permit attempts to access those registers.
-
- It would be possible to require the caller to do this, but we'd
- have to change the API for this function to reflect that, and
- audit all callers. */
- if (regs && regs->num_regs > 0)
- for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++)
- regs->start[mcnt] = regs->end[mcnt] = -1;
+ /* If we have regs and the regs structure has more elements than
+ were in the pattern, set the extra elements to -1. If we
+ (re)allocated the registers, this is the case, because we
+ always allocate enough to have at least one -1 at the end.
+
+ We do this even when no_sub is set because some applications
+ (XEmacs) reuse register structures which may contain stale
+ information, and permit attempts to access those registers.
+
+ It would be possible to require the caller to do this, but we'd
+ have to change the API for this function to reflect that, and
+ audit all callers. */
+ if (regs && regs->num_regs > 0)
+ for (mcnt = num_nonshy_regs; mcnt < regs->num_regs; mcnt++)
+ regs->start[mcnt] = regs->end[mcnt] = -1;
+ }
DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
nfailure_points_pushed, nfailure_points_popped,
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 3 participants
- 2 comments