Merge from origin/emacs-26

6e54762 Fix Apple Script permissions error 19f705c Fix typo in 'timerp' documentation
vibhavp · Oct 12, 2018 · 7a7a3a4 · 7a7a3a4
2 parents 9c231a4 + 6e54762
commit 7a7a3a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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 non-@code{nil} of @code{object} is a
+This predicate function returns non-@code{nil} if @code{object} is a
 timer.
 @end defun
 

diff --git 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>