[Emacs-diffs] master 7a7a3a4 1/3: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 7a7a3a4bfe4086d3c89ff7baa6db1f746c28b5c2
Merge: 9c231a4 6e54762
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    6e54762 Fix Apple Script permissions error
    19f705c Fix typo in 'timerp' documentation
---
 doc/lispref/os.texi              | 2 +-
 nextstep/templates/Info.plist.in | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 64c327c..d74fec5 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1841,7 +1841,7 @@ special object that stores the information about the next 
invocation
 times and the function to invoke.
 
 @defun timerp object
-This predicate function returns address@hidden of @code{object} is a
+This predicate function returns address@hidden if @code{object} is a
 timer.
 @end defun
 
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index 9960f08..406d6f7 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -675,5 +675,7 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.
        </array>
        <key>NSAppleScriptEnabled</key>
        <string>YES</string>
+        <key>NSAppleEventsUsageDescription</key>
+        <string>Emacs requires permission to send AppleEvents to other 
applications.</string>
 </dict>
 </plist>