1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Commit Graph

147 Commits

Author SHA1 Message Date
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
4e643dd23c Add 2008 to copyright years. 2008-01-07 02:11:00 +00:00
Glenn Morris
2e49e9f7f7 (gud-find-c-expr): Declare as a function. 2007-11-17 03:49:59 +00:00
Dan Nicolaescu
e83d1fe875 * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.

* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.

* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.

* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
Glenn Morris
7a05f2bd9a (fortran-mode-map): Don't bind M-;.
(fortran-mode): Set values for comment-region-function,
uncomment-region-function and comment-insert-comment-function.
(fortran-uncomment-region): New function.
2007-11-03 03:03:31 +00:00
Glenn Morris
7e9d87d003 (fortran-tab-mode-string): Revert change merged in from EMACS_22 branch.
This code behaves differently on the trunk.
2007-10-27 19:14:08 +00:00
Miles Bader
fdc9061358 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908
2007-10-27 09:07:17 +00:00
Glenn Morris
be6a2f1a5a (fortran-comment-line-start-skip, fortran-directive-re):
Mark these regexps as safe if they are strings.
2007-10-25 03:57:21 +00:00
Glenn Morris
cb1e8a7540 (fortran-comment-line-start-skip, fortran-directive-re):
Mark these regexps as safe if they are strings.
2007-10-25 03:57:09 +00:00
Glenn Morris
9d23c92525 Untabify. 2007-10-23 07:02:42 +00:00
Glenn Morris
6ac8618ab2 (fortran-tab-mode-default)
(fortran-tab-mode-string, fortran-do-indent, fortran-if-indent)
(fortran-structure-indent, fortran-continuation-indent)
(fortran-comment-indent, fortran-comment-line-extra-indent)
(fortran-comment-line-start)
(fortran-minimum-statement-indent-fixed)
(fortran-minimum-statement-indent-tab)
(fortran-comment-indent-char, fortran-line-number-indent)
(fortran-check-all-num-for-matching-do)
(fortran-blink-matching-if, fortran-continuation-string)
(fortran-comment-region, fortran-electric-line-number)
(fortran-column-ruler-fixed, fortran-column-ruler-tab)
(fortran-analyze-depth, fortran-break-before-delimiters):
Give an appropriate safe-local-variable property.
2007-10-23 06:52:04 +00:00
Glenn Morris
1aa6c83acd (fortran-tab-mode-default)
(fortran-tab-mode-string, fortran-do-indent, fortran-if-indent)
(fortran-structure-indent, fortran-continuation-indent)
(fortran-comment-indent, fortran-comment-line-extra-indent)
(fortran-comment-line-start)
(fortran-minimum-statement-indent-fixed)
(fortran-minimum-statement-indent-tab)
(fortran-comment-indent-char, fortran-line-number-indent)
(fortran-check-all-num-for-matching-do)
(fortran-blink-matching-if, fortran-continuation-string)
(fortran-comment-region, fortran-electric-line-number)
(fortran-column-ruler-fixed, fortran-column-ruler-tab)
(fortran-analyze-depth, fortran-break-before-delimiters):
Give an appropriate safe-local-variable property.
2007-10-23 06:51:54 +00:00
Glenn Morris
ca03b5a94d Martin Rudalics <rudalics at gmx.at>
(fortran-mode-map, fortran-window-create): Use window-full-width-p.
2007-10-22 07:40:37 +00:00
Glenn Morris
b8e4cd1d74 Martin Rudalics <rudalics at gmx.at>
(fortran-mode-map, fortran-window-create): Use window-full-width-p.
2007-10-22 07:40:12 +00:00
Glenn Morris
8c5de2a119 (fortran-mode-abbrev-table, fortran-line-length): Use mapc rather than mapcar. 2007-09-21 08:05:59 +00:00
Stefan Monnier
a227f16320 (fortran-mode): Set font-lock-syntactic-keywords via font-lock-defaults. 2007-09-07 15:07:13 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
e7f767c25e Replace `iff' in doc-strings and comments. 2007-08-08 07:34:30 +00:00
Glenn Morris
62ce2ec5dc (fortran-font-lock-syntactic-keywords): Fix off-by-one error in
previous change.
2007-08-03 03:19:36 +00:00
Glenn Morris
694cf05e5b Remove leading `*' from all defcustom doc strings.
(fortran-tab-mode-default): Remove needless autoload.
(fortran-tab-mode-string): Add help-echo and mouse properties, and
mark as risky.
(fortran-line-length): New buffer-local variable, safe if integer.
(fortran-if-start-re, fortran-end-prog-re1, fortran-end-prog-re):
Change from variables to constants.
(fortran-font-lock-syntactic-keywords): Delete as a variable,
replace with a new function definition.
(fortran-mode): Use fortran-line-length, and
fortran-font-lock-syntactic-keywords as a function.  Add a
hack-local-variables-hook function.
(fortran-line-length, fortran-hack-local-variables): New functions.
(fortran-window-create, fortran-strip-sequence-nos): Doc fix.  Use
fortran-line-length rather than 72.
(fortran-window-create-momentarily): Doc fix.
2007-08-01 06:18:16 +00:00
Glenn Morris
1a484753b2 Switch license to GPLv3 or later. 2007-07-25 04:29:40 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Glenn Morris
9ab66fc758 (fortran-mode-abbrev-table): Define abbrevs even if abbrev-table is
non-nil (saved user abbrevs may have been restored).
2006-12-05 05:24:48 +00:00
Glenn Morris
742695df24 (fortran-font-lock-keywords-4): Add `min'.
(fortran-window-create-momentarily): Do not need string-to-char.
2006-11-28 03:45:39 +00:00
Stefan Monnier
5d72423543 Move defvars out of eval-when-compile.
(fortran-break-line): Remove unused var `opoint'.
(fortran-abbrev-start): Obey help-event-list.
2006-01-18 15:56:30 +00:00
Juri Linkov
8ec3bce045 Add :link (custom-group-link font-lock-faces) to defgroup. 2005-11-17 07:40:11 +00:00
Glenn Morris
7533f3b573 (fortran-blink-match): Use `blink-matching-delay'. 2005-11-02 08:30:45 +00:00
Glenn Morris
aff88519c0 Update maintainer email address. 2005-10-08 04:49:48 +00:00
Juanma Barranquero
1769936dd0 (fortran-indent-to-column): "?\ " -> "?\s".
(font-lock-syntactic-keywords, gud-find-expr-function): Add defvars.
2005-08-30 10:50:41 +00:00
Nick Roberts
034babe1e1 Update copyright for release of 22.1 for progmodes directory. 2005-08-01 08:43:45 +00:00
Lute Kamstra
3a35cf56e7 Update FSF's address. 2005-07-04 17:55:18 +00:00
Lute Kamstra
9a9691963d * progmodes/ada-mode.el (ada-mode):
* progmodes/antlr-mode.el (antlr-mode):
* progmodes/autoconf.el (autoconf-mode):
* progmodes/dcl-mode.el (dcl-mode):
* progmodes/delphi.el (delphi-mode):
* progmodes/ebrowse.el (ebrowse-tree-mode)
(ebrowse-electric-list-mode, ebrowse-member-mode)
(ebrowse-electric-position-mode):
* progmodes/f90.el (f90-mode):
* progmodes/fortran.el (fortran-mode):
* progmodes/icon.el (icon-mode):
* progmodes/idlw-help.el (idlwave-help-mode):
* progmodes/idlw-shell.el (idlwave-shell-mode):
* progmodes/idlwave.el (idlwave-mode):
* progmodes/inf-lisp.el (inferior-lisp-mode):
* progmodes/m4-mode.el (m4-mode):
* progmodes/meta-mode.el (metafont-mode, metapost-mode):
* progmodes/modula2.el (modula-2-mode):
* progmodes/octave-inf.el (inferior-octave-mode):
* progmodes/octave-mod.el (octave-mode):
* progmodes/pascal.el (pascal-mode):
* progmodes/sh-script.el (sh-mode):
* progmodes/sql.el (sql-mode, sql-interactive-mode):
* progmodes/vhdl-mode.el (vhdl-mode):
* progmodes/xscheme.el (scheme-interaction-mode):  Use run-mode-hooks.
2005-05-26 16:43:37 +00:00
Glenn Morris
8cb8832f25 Reformat and update copyright years.
(fortran-if-indent): Doc fix.
(fortran-font-lock-keywords-2): Add "where", "elsewhere".
(fortran-font-lock-keywords-4): New variable.
(fortran-blocks-re, fortran-end-block-re)
(fortran-start-block-re): New constants, for hideshow.
(hs-special-modes-alist): Add a Fortran entry.
(fortran-mode-map): Bind fortran-end-of-block,
fortran-beginning-of-block to \M-\C-n, \M-\C-p.
(fortran-mode): Doc fix. Add fortran-font-lock-keywords-4.
(fortran-looking-at-if-then, fortran-end-of-block)
(fortran-beginning-of-block): New functions, for hideshow.
2005-03-29 18:59:02 +00:00
Kim F. Storm
bf247b6ed0 Change release version from 21.4 to 22.1 throughout.
Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
Richard M. Stallman
fd98e23a7a (fortran-mode): Use mode-require-final-newline. 2004-12-31 14:53:40 +00:00
Glenn Morris
8aa7b879cd (fortran-fill): Use local var `bol' rather than duplicate call to
`line-beginning-position'.
2004-04-30 18:54:44 +00:00
Glenn Morris
337c50a52f (fortran-break-before-delimiters): Doc fix.
(fortran-break-delimiters-re, fortran-no-break-re): New defconsts.
(fortran-fill): When filling a string, adjust re-search-backward
argument for special case of string just on fill-column.
When filling non-string, allow one extra char if
fortran-break-before-delimiters is non-nil.  Suggested by
Michael Hagemann <michael.hagemann@unibas.ch>.
Use fortran-break-delimiters-re and fortran-no-break-re to
correctly handle cases such as "**".
2004-01-25 23:59:57 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Stefan Monnier
5727e74864 (fortran-gud-find-expr): Move from gud.el (was gud-find-fortran-expr).
(fortran-mode): Set gud-find-expr-function.
2003-06-18 23:25:39 +00:00
Nick Roberts
f6bf87c5a1 (fortran-gud-syntax-table): Syntax table
for parsing Fortran expressions for gud-print. (Stefan Monnier)
(fortran-mode): Add local variable gud-find-expr.
2003-06-18 22:35:37 +00:00
Glenn Morris
be35ca9f5e (dabbrev-case-fold-search): Add defvar for compiler.
(fortran-abbrev-start): Make XEmacs compatible.
2003-04-20 13:03:04 +00:00
Glenn Morris
0a39a75cc4 Comment changes.
(fortran-column-ruler): Minor doc change.
2003-04-16 11:10:03 +00:00
Glenn Morris
a7113309ba (fortran-tab-mode-minor-mode-string): Delete this variable,
introduced in previous change.
(fortran-tab-mode-string): Change default value.
(fortran-mode): Use mode-line-process (rather than
minor-mode-alist) to indicate tab format code.
(fortran-analyze-file-format): Return fortran-tab-mode-default if
no match.
2003-04-15 20:44:19 +00:00
Glenn Morris
5b04210ced Whitespace changes, some re-ordering of code, trivial commentary change.
(fortran, fortran-indent, fortran-comment)
(fortran-tab-mode-default, fortran-continuation-indent)
(fortran-comment-indent-style, fortran-blink-matching-if)
(fortran-continuation-string, fortran-electric-line-number)
(fortran-break-before-delimiters, fortran-mode-hook)
(fortran-end-prog-re, fortran-imenu-generic-expression): Minor doc changes.
(fortran-tab-mode-minor-mode-string): New variable.
(fortran-tab-mode-string): Now customization is meaningful.
(fortran-column-ruler-fixed, fortran-column-ruler-tab)
(fortran-analyze-depth): Use defcustom.
(fortran-if-start-re, fortran-end-prog-re1, fortran-fill)
(fortran-break-line, fortran-prepare-abbrev-list-buffer)
(fortran-auto-fill): Add doc string.
(fortran-type-types): New constant (was local to let binding).
(fortran-font-lock-keywords-1, fortran-font-lock-keywords-2)
(fortran-font-lock-syntactic-keywords): Initialize in defvar.
(fortran-font-lock-keywords-3): Initialize in defvar.  Use 1+ now
depth of fortran-type-types has changed.  Remove extra and.
(fortran-mode-menu): Minor re-organization.  Use lookup-key.
(fortran-mode): Doc changes.  Some re-organization.  Use
fortran-tab-mode-minor-mode-string.
(fortran-comment-indent): Add doc string.  Move save-excursion. Use 1+.
(fortran-indent-comment, fortran-fill-statement): Change interactive spec.
Use unless.
(fortran-comment-region): Doc change.  Reverse logic of arg test.  Use zerop.
(fortran-abbrev-start, fortran-split-line)
(fortran-electric-line-number, fortran-indent-subprogram)
(fortran-strip-sequence-nos): Change interactive spec.
(fortran-remove-continuation): Add doc string.  Use when.
(fortran-numerical-continuation-char): Doc change.  Use 1+.
(fortran-previous-statement, fortran-next-statement)
(fortran-beginning-do, fortran-calculate-indent)
(fortran-end-do, fortran-end-if, fortran-beginning-if): Use zerop, 1+, 1-.
(fortran-blink-match, fortran-check-for-matching-do): Use when.
(fortran-indent-line): Change interactive spec.  Remove un-needed if.
Use when.
(fortran-indent-to-column): Doc change.  Use when, unless.
(fortran-find-comment-start-skip): No longer interactive.
(fortran-analyze-file-format): Minor doc change.  Remove un-needed setq.
(minor-mode-alist): Use add-to-list.
(fortran-fill-paragraph): Change interactive spec, doc string.
2003-04-15 19:22:31 +00:00
Glenn Morris
98110b1f02 (fortran-previous-statement): Check for fortran-continuation-string.
(fortran-calculate-indent): Do not add extra whitespace to strings
broken over lines.  Remove superfluous progn.
(fortran-fill): Handle long strings that must be broken over lines.
2003-04-13 13:11:24 +00:00
Glenn Morris
1d97a48dc2 (fortran-abbrev-start): Only offer help if abbrev-mode is active. 2003-04-12 15:44:59 +00:00
Glenn Morris
0ab47edc28 (fortran-fill): Fill lines that do not have comments. 2003-02-12 21:52:37 +00:00
Stefan Monnier
2bcfe15e42 (fortran-mode): Set comment-use-syntax.
(fortran-fill-paragraph): Use fill-comment-paragraph.
2003-02-12 15:23:21 +00:00
Glenn Morris
6f9a4ce206 (fortran-mode-abbrev-table): Handle `define-abbrev' with either 5
or 6 arguments.
2002-12-12 01:06:54 +00:00
Glenn Morris
845d331ee6 (fortran-beginning-do): Ignore labelled DO loops altogether. 2002-10-06 14:57:38 +00:00