sfos/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-26

Browse source 
6e54762 Fix Apple Script permissions error
19f705c Fix typo in 'timerp' documentation
This commit is contained in:
Glenn Morris 2018-10-12 10:28:40 -07:00
commit 7a7a3a4bfe
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/lispref/os.texi
View file

@ -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

2
nextstep/templates/Info.plist.in
View file

@ -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>