[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 90ec81f 3/3: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 90ec81f 3/3: Merge from origin/emacs-27 |
Date: |
Fri, 25 Dec 2020 13:41:44 -0500 (EST) |
branch: master
commit 90ec81f5b243b6b7b3ebe2de394b20e8078ebc96
Merge: 47799cc b242bbb
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
b242bbb073 (origin/emacs-27) ; lisp/org/org.el: Fix Version header.
e0fc939c5f Add more details to the "word processor" section
fda9b3e83a * src/Makefile.in (DO_CODESIGN): Fix expected architecture...
---
etc/TODO | 30 ++++++++++++++++++++++++++++++
lisp/org/org.el | 2 +-
src/Makefile.in | 2 +-
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/etc/TODO b/etc/TODO
index 08f8510..2a9fd88 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -242,6 +242,36 @@ https://lists.gnu.org/r/emacs-devel/2013-11/msg00515.html
processing. That is why we added text properties and variable
width fonts. However, more features are still needed to achieve this.
+Specifically, a major mode with the following features and abilities
+should be added to Emacs:
+
+ . import / export MS Office documents
+ . import / export Open Document Format (.odt) files
+ . import / export RTF files
+ . export to a PDF file
+ . select a font and its size
+ . apply a bold / italic / underline / strikethrough effect
+ . superscripts / subscripts
+ . apply a left / center / right / justified effect
+ . change the font color and the background color
+ . pixel-level text fill, justification, and indentation (so that
+ variable-pitch fonts could be freely used)
+ . create a list
+ . insert and change a table
+ . insert a picture
+ . define / use / modify styles
+ . print preview / print, in a way that is similar to what's on screen
+ (e.g., wrt the place where lines wrap)
+ . use footnotes
+ . support for "track changes" markings, including those which come
+ from Office documents
+ . multiple columns
+ . change page headers and footers
+ . save all the properties and settings mentioned above with the text
+ to a file, so that they are restored when later visiting that file
+
+The existing Enriched mode can be used as a starting point.
+
** Support ligatures out of the box
For the list of frequently-used typographical ligatures, see
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 0d7c6c8..0473cae 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -8,7 +8,7 @@
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: https://orgmode.org
-;; Version: 9.4.3
+;; Version: 9.4.4
;; This file is part of GNU Emacs.
;;
diff --git a/src/Makefile.in b/src/Makefile.in
index 39c0f12..19304cc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -338,7 +338,7 @@ HAVE_PDUMPER = @HAVE_PDUMPER@
## ARM Macs require that all code have a valid signature. Since pump
## invalidates the signature, we must re-sign to fix it.
-DO_CODESIGN=$(patsubst aarch64-apple-darwin%,yes,@configuration@)
+DO_CODESIGN=$(patsubst arm-apple-darwin%,yes,@configuration@)
# 'make' verbosity.
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@