aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorGlenn Morris2018-07-02 19:19:26 -0700
committerGlenn Morris2018-07-02 19:19:26 -0700
commit02f2f336af7c4129ec79ab00881bba3e14ff9820 (patch)
tree3f279977bb231ea6ddab8680999bc1bffcb31071 /etc
parentbc0e36df8d33595d6411ec4c18e3f4b643c01306 (diff)
parentfc5cae731cede7e00f3f2d40d6577537f872d439 (diff)
downloademacs-02f2f336af7c4129ec79ab00881bba3e14ff9820.tar.gz
emacs-02f2f336af7c4129ec79ab00881bba3e14ff9820.zip
Merge from origin/emacs-26
fc5cae7 ; Fix ChangeLog typo. e17a5e5 ; make change-history-commit f205928 * etc/HISTORY: Cite Brinkoff on early history. 4e58ca8 Document internal use of 'above-suspended' z-group frame para... 4bd43b0 Increase max-lisp-eval-depth adjustment while in debugger (bu... ab98352 Improve on last change in replace-buffer-contents 2f149c0 Fix a factual error in Introduction to Emacs Lisp 8ad50a3 ; * lisp/files.el (buffer-offer-save): Doc fix. (Bug#32000) c80f31f Minor improvements in documentation of imenu.el 8ebb683 Avoid errors with recentering in 'skeleton-insert' e980a3c * src/lisp.h: Omit obsolete comment re bytecode stack. eec71eb Speed up replace-buffer-contents 93c41ce Remove extra process call from vc-git-find-file-hook 7ea0873 ; Update some commentary 4a7f423 Speed up vc-git-dir-status-files 9134c84 Avoid compiler warning using coding.h Conflicts: src/editfns.c
Diffstat (limited to 'etc')
-rw-r--r--etc/HISTORY7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/HISTORY b/etc/HISTORY
index ba86182a1c3..b239904253b 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -12,10 +12,11 @@ development is sketchy, the following text summarizes what is known.
12EMACS started out as a set of macros atop the TECO text editor, and 12EMACS started out as a set of macros atop the TECO text editor, and
13was first operational in late 1976. It was inspired by earlier work 13was first operational in late 1976. It was inspired by earlier work
14such as the E editor of Stanford, and was based on older TECO macro 14such as the E editor of Stanford, and was based on older TECO macro
15sets. EMACS in turn inspired several similar editors. See: 15sets. See: Stallman RM. EMACS: The Extensible, Customizable
16Stallman RM. EMACS: The Extensible, Customizable Self-Documenting 16Self-Documenting Display Editor. AI Memo 519a, MIT, 1981-03-26
17Display Editor. AI Memo 519a, MIT, 1981-03-26
18<http://dspace.mit.edu/bitstream/handle/1721.1/5736/AIM-519A.pdf>. 17<http://dspace.mit.edu/bitstream/handle/1721.1/5736/AIM-519A.pdf>.
18EMACS in turn inspired several similar editors. For a summary of
19this history, see <https://github.com/larsbrinkhoff/emacs-history>.
19 20
20In 1984, work began on GNU Emacs, a fresh implementation designed to 21In 1984, work began on GNU Emacs, a fresh implementation designed to
21run on GNU and GNU-like systems, with a full-featured Lisp at its 22run on GNU and GNU-like systems, with a full-featured Lisp at its