aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-01-25 19:39:34 -0800
committerGlenn Morris2014-01-25 19:39:34 -0800
commitde6a923b0bedaf6dccf9832e09cc7fff66440c3c (patch)
treed275550380a6ed5e0fd0ec40406d3a83e20ef667
parente6f29a682914083dd1a7ed5a4391ae72b7f3e764 (diff)
downloademacs-de6a923b0bedaf6dccf9832e09cc7fff66440c3c.tar.gz
emacs-de6a923b0bedaf6dccf9832e09cc7fff66440c3c.zip
Doc updates for opascal.el
* lisp/progmodes/opascal.el (opascal-tab-always-indents, opascal-tab): Doc fix. Make obsolete. (opascal-mode): No longer mention opascal-tab-always-indents in doc. * doc/emacs/ack.texi (Acknowledgments): * doc/emacs/programs.texi (Program Modes): Update for delphi.el -> opascal.el renaming. * etc/NEWS: Edits.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/ack.texi4
-rw-r--r--doc/emacs/programs.texi10
-rw-r--r--etc/NEWS28
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/opascal.el16
6 files changed, 44 insertions, 22 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2a0123ee269..ce43ff1a474 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
12014-01-26 Glenn Morris <rgm@gnu.org> 12014-01-26 Glenn Morris <rgm@gnu.org>
2 2
3 * ack.texi (Acknowledgments):
4 * programs.texi (Program Modes):
5 Update for delphi.el -> opascal.el renaming.
6
3 * misc.texi (Sorting): Add findex for reverse-region. 7 * misc.texi (Sorting): Add findex for reverse-region.
4 8
5 * killing.texi (Deletion): Mention delete-duplicate-lines. 9 * killing.texi (Deletion): Mention delete-duplicate-lines.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 74d96c4aa77..8f8e741c910 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -126,8 +126,8 @@ by Oliver Seidel), a package for maintaining @file{TODO} list files.
126Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars. 126Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
127 127
128@item 128@item
129Ray Blaak and Simon South wrote @file{delphi.el}, a mode for editing 129Ray Blaak and Simon South wrote @file{opascal.el}, a mode for editing
130Delphi (Object Pascal) source code. 130Object Pascal source code.
131 131
132@item 132@item
133Martin Blais, Stefan Merten, and David Goodger wrote @file{rst.el}, a 133Martin Blais, Stefan Merten, and David Goodger wrote @file{rst.el}, a
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index f38edd4fe73..8e62a031293 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -75,17 +75,17 @@ mode for the C programming language is @code{c-mode}.
75@cindex VHDL mode 75@cindex VHDL mode
76@cindex M4 mode 76@cindex M4 mode
77@cindex Shell-script mode 77@cindex Shell-script mode
78@cindex Delphi mode 78@cindex OPascal mode
79@cindex PostScript mode 79@cindex PostScript mode
80@cindex Conf mode 80@cindex Conf mode
81@cindex DNS mode 81@cindex DNS mode
82@cindex Javascript mode 82@cindex Javascript mode
83 Emacs has programming language modes for Lisp, Scheme, the 83 Emacs has programming language modes for Lisp, Scheme, the
84Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++, Delphi, 84Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++,
85Fortran, Icon, IDL (CORBA), IDLWAVE, Java, Javascript, Metafont 85Fortran, Icon, IDL (CORBA), IDLWAVE, Java, Javascript, Metafont
86(@TeX{}'s companion for font creation), Modula2, Objective-C, Octave, 86(@TeX{}'s companion for font creation), Modula2, Object Pascal, Objective-C,
87Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl, and 87Octave, Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl,
88VHDL@. An alternative mode for Perl is called CPerl mode. Modes are 88and VHDL@. An alternative mode for Perl is called CPerl mode. Modes are
89also available for the scripting languages of the common GNU and Unix 89also available for the scripting languages of the common GNU and Unix
90shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files, and for 90shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files, and for
91makefiles, DNS master files, and various sorts of configuration files. 91makefiles, DNS master files, and various sorts of configuration files.
diff --git a/etc/NEWS b/etc/NEWS
index f913b80da86..f934bc30bd6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -634,14 +634,19 @@ See MH-E-NEWS for details.
634 634
635*** Documentation lookup/search. 635*** Documentation lookup/search.
636 636
637** OPascal mode is the new name for Delphi mode. 637+++
638** OPascal mode is the new name for Delphi mode
638 639
640---
639*** All delphi-* variables and functions have been renamed to opascal-*. 641*** All delphi-* variables and functions have been renamed to opascal-*.
642Obsolete aliases exist for those likely to have been used externally.
640 643
641*** `delphi-newline-always-indents' is not supported any more. 644---
645*** The option `delphi-newline-always-indents' has been removed.
642Use `electric-indent-mode' instead. 646Use `electric-indent-mode' instead.
643 647
644*** `delphi-tab' is gone, replaced by `indent-for-tab-command'. 648---
649*** The TAB key runs the standard `indent-for-tab-command', not `delphi-tab'.
645 650
646** Package 651** Package
647 652
@@ -690,17 +695,23 @@ rather than mboxo. Customize `unrmail-mbox-format' to change this.
690 695
691** Ruby mode 696** Ruby mode
692 697
693*** New option `ruby-encoding-magic-comment-style'. 698---
699*** Improved syntax highlighting and indentation.
694 700
695*** New option `ruby-custom-encoding-magic-comment-template'. 701---
702*** New `electric-indent-mode' integration.
696 703
697*** Improved syntax highlighting and indentation. 704---
705*** New option `ruby-encoding-magic-comment-style'.
698 706
699*** More Ruby file types have been added to `auto-mode-alist'. 707---
708*** New option `ruby-custom-encoding-magic-comment-template'.
700 709
710---
701*** New option `ruby-align-to-stmt-keywords'. 711*** New option `ruby-align-to-stmt-keywords'.
702 712
703*** New `electric-indent-mode' integration. 713---
714*** More Ruby file types have been added to `auto-mode-alist'.
704 715
705** Search and Replace 716** Search and Replace
706 717
@@ -760,6 +771,7 @@ All non-ancient Bash versions support this option.
760Emacs can learn the appropriate indentation settings if you provide it 771Emacs can learn the appropriate indentation settings if you provide it
761with an indented sample file. 772with an indented sample file.
762 773
774---
763** New Term mode option `term-suppress-hard-newline'. 775** New Term mode option `term-suppress-hard-newline'.
764 776
765+++ 777+++
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cded7bcb0fc..fcbff5b8ee5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12014-01-26 Glenn Morris <rgm@gnu.org> 12014-01-26 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/opascal.el (opascal-tab-always-indents, opascal-tab):
4 Doc fix. Make obsolete.
5 (opascal-mode): No longer mention opascal-tab-always-indents in doc.
6
3 * sort.el (delete-duplicate-lines): Doc fix. 7 * sort.el (delete-duplicate-lines): Doc fix.
4 8
52014-01-25 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de> 92014-01-25 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de>
diff --git a/lisp/progmodes/opascal.el b/lisp/progmodes/opascal.el
index 0ea8b2e2ea6..dfb2b72a9d6 100644
--- a/lisp/progmodes/opascal.el
+++ b/lisp/progmodes/opascal.el
@@ -106,10 +106,14 @@ end; end;"
106(define-obsolete-variable-alias 106(define-obsolete-variable-alias
107 'delphi-tab-always-indents 'opascal-tab-always-indents "24.4") 107 'delphi-tab-always-indents 'opascal-tab-always-indents "24.4")
108(defcustom opascal-tab-always-indents tab-always-indent 108(defcustom opascal-tab-always-indents tab-always-indent
109 "Non-nil means TAB in OPascal mode should always reindent the current line, 109 "Non-nil means `opascal-tab' should always reindent the current line.
110regardless of where in the line point is when the TAB command is used." 110That is, regardless of where in the line point is at the time."
111 :type 'boolean) 111 :type 'boolean)
112 112
113(make-obsolete-variable 'opascal-tab-always-indents
114 "use `indent-for-tab-command' and `tab-always-indent'."
115 "24.4")
116
113(defconst opascal-directives 117(defconst opascal-directives
114 '(absolute abstract assembler automated cdecl default dispid dynamic 118 '(absolute abstract assembler automated cdecl default dispid dynamic
115 export external far forward index inline message name near nodefault 119 export external far forward index inline message name near nodefault
@@ -1447,8 +1451,8 @@ If before the indent, the point is moved to the indent."
1447 1451
1448 1452
1449(defun opascal-tab () 1453(defun opascal-tab ()
1450 "Indent the region, when Transient Mark mode is enabled and the region is 1454 "Indent the region, if Transient Mark mode is on and the region is active.
1451active. Otherwise, indent the current line or insert a TAB, depending on the 1455Otherwise, indent the current line or insert a TAB, depending on the
1452value of `opascal-tab-always-indents' and the current line position." 1456value of `opascal-tab-always-indents' and the current line position."
1453 (interactive) 1457 (interactive)
1454 (cond ((use-region-p) 1458 (cond ((use-region-p)
@@ -1465,6 +1469,7 @@ value of `opascal-tab-always-indents' and the current line position."
1465 ;; Otherwise, insert a tab character. 1469 ;; Otherwise, insert a tab character.
1466 (insert "\t")))) 1470 (insert "\t"))))
1467 1471
1472(make-obsolete 'opascal-tab 'indent-for-tab-command "24.4")
1468 1473
1469(defun opascal-is-directory (path) 1474(defun opascal-is-directory (path)
1470 ;; True if the specified path is an existing directory. 1475 ;; True if the specified path is an existing directory.
@@ -1754,9 +1759,6 @@ Customization:
1754 Extra indentation for blocks in compound statements. 1759 Extra indentation for blocks in compound statements.
1755 `opascal-case-label-indent' (default 0) 1760 `opascal-case-label-indent' (default 0)
1756 Extra indentation for case statement labels. 1761 Extra indentation for case statement labels.
1757 `opascal-tab-always-indents' (default `tab-always-indents')
1758 Non-nil means TAB in OPascal mode should always reindent the current line,
1759 regardless of where in the line point is when the TAB command is used.
1760 `opascal-search-path' (default .) 1762 `opascal-search-path' (default .)
1761 Directories to search when finding external units. 1763 Directories to search when finding external units.
1762 `opascal-verbose' (default nil) 1764 `opascal-verbose' (default nil)