aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorJohn Wiegley2016-03-11 13:33:32 -0800
committerJohn Wiegley2016-03-11 13:33:32 -0800
commit63efcc268635dea78c6bd80749eae4ee2c72d717 (patch)
tree888b43de0eb148cf46a129a15f08a80caa8a5dfe /src/process.c
parentb4fbd69b66a927ad8ff479bee6ca57e977d7e649 (diff)
parentfacb5e20ce186e47506860bde982e35020fedce5 (diff)
downloademacs-63efcc268635dea78c6bd80749eae4ee2c72d717.tar.gz
emacs-63efcc268635dea78c6bd80749eae4ee2c72d717.zip
Merge from origin/emacs-25
facb5e2 Update Emacs manual section related to character folding 4efea8e ; * etc/DEBUG: Fix a typo. (Bug#22984) f8df21b Update admin/notes/unicode 950be68 Add symref-filepattern entries for c?perl-mode 8b8a6ad Don't use XRANDR 1.3 extensions if the server doesn't support them. 985dacf ; NEWS update for the last change in etags 741a6f8 Sync with gnulib 7352c6c Rework C source files to avoid ^( a589e9a By default, etags produces unqualified Perl tag names 72c7438 Indent methods with keyword names correctly 28532a9 Propertize character literals and special global variables differently a7d6f39 ; Fix last change in NEWS 83b2a20 Change how /etc/NEWS presents character folding b417c5a Revert "Revert "Backport: * lisp/isearch.el: Turn char-folding off by default"" 711ca36 Properly handle lambda as read function (bug 22961) 1b9d616 Propertize operator symbol names with symbol syntax class 9b16bc2 Stop recognizing :#{} as symbol in ruby-mode 366ec77 Allow using the left shift operator without spaces on both sides 02bf7cc Properly handle unquoting in wdired (bug 22938) 16cf469 ; Spelling fix and tighten up comment f50bc04 Allow splat operator before percent literal 991c801 Don't apply the return value of goto-char as syntax class 6e63b3e Guard against nested percent literals 066f3bc Recognize iuwu-mod after an escaped newline 6f7a57c Fix symbolic mode string conversion for s and t 50b9826 Update 'ucs-names' database 993b2fb Improve doc string of 'shell-command' b71c717 Make the code in movemail_strftime more general cc057e4 Speed up redisplay of binary files with long series of nulls e51b27e Remove the highlighting support for quoting 'like this' inside Lisp docstrings b1abce1 Restore leading space in movemail pop output 98b8d44 Fix bidi-paragraph-direction in Rmail view buffer dc9d837 Don't misindent computed property generator methods 7923112 Fix mbox files produced by movemail on MS-Windows c45a1ca doc string file descriptor exhaustion fix 265141b Fix Bug#22814
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/process.c b/src/process.c
index 56f036cd7d2..a518c2bffb8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7,8 +7,8 @@ This file is part of GNU Emacs.
7 7
8GNU Emacs is free software: you can redistribute it and/or modify 8GNU Emacs is free software: you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation, either version 3 of the License, or 10the Free Software Foundation, either version 3 of the License, or (at
11(at your option) any later version. 11your option) any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU Emacs is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of 14but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -982,7 +982,7 @@ DEFUN ("process-command", Fprocess_command, Sprocess_command, 1, 1, 0,
982This is a list of strings, the first string being the program executed 982This is a list of strings, the first string being the program executed
983and the rest of the strings being the arguments given to it. 983and the rest of the strings being the arguments given to it.
984For a network or serial process, this is nil (process is running) or t 984For a network or serial process, this is nil (process is running) or t
985(process is stopped). */) 985\(process is stopped). */)
986 (register Lisp_Object process) 986 (register Lisp_Object process)
987{ 987{
988 CHECK_PROCESS (process); 988 CHECK_PROCESS (process);
@@ -2726,7 +2726,7 @@ is not given or nil, 1 stopbit is used.
2726:flowcontrol FLOWCONTROL -- FLOWCONTROL determines the type of 2726:flowcontrol FLOWCONTROL -- FLOWCONTROL determines the type of
2727flowcontrol to be used, which is either nil (don't use flowcontrol), 2727flowcontrol to be used, which is either nil (don't use flowcontrol),
2728the symbol `hw' (use RTS/CTS hardware flowcontrol), or the symbol `sw' 2728the symbol `hw' (use RTS/CTS hardware flowcontrol), or the symbol `sw'
2729(use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no 2729\(use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no
2730flowcontrol is used. 2730flowcontrol is used.
2731 2731
2732`serial-process-configure' is called by `make-serial-process' for the 2732`serial-process-configure' is called by `make-serial-process' for the
@@ -2734,12 +2734,12 @@ initial configuration of the serial port.
2734 2734
2735Examples: 2735Examples:
2736 2736
2737(serial-process-configure :process "/dev/ttyS0" :speed 1200) 2737\(serial-process-configure :process "/dev/ttyS0" :speed 1200)
2738 2738
2739(serial-process-configure 2739\(serial-process-configure
2740 :buffer "COM1" :stopbits 1 :parity \\='odd :flowcontrol \\='hw) 2740 :buffer "COM1" :stopbits 1 :parity \\='odd :flowcontrol \\='hw)
2741 2741
2742(serial-process-configure :port "\\\\.\\COM13" :bytesize 7) 2742\(serial-process-configure :port "\\\\.\\COM13" :bytesize 7)
2743 2743
2744usage: (serial-process-configure &rest ARGS) */) 2744usage: (serial-process-configure &rest ARGS) */)
2745 (ptrdiff_t nargs, Lisp_Object *args) 2745 (ptrdiff_t nargs, Lisp_Object *args)
@@ -2833,13 +2833,13 @@ is available via the function `process-contact'.
2833 2833
2834Examples: 2834Examples:
2835 2835
2836(make-serial-process :port "/dev/ttyS0" :speed 9600) 2836\(make-serial-process :port "/dev/ttyS0" :speed 9600)
2837 2837
2838(make-serial-process :port "COM1" :speed 115200 :stopbits 2) 2838\(make-serial-process :port "COM1" :speed 115200 :stopbits 2)
2839 2839
2840(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd) 2840\(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd)
2841 2841
2842(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) 2842\(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil)
2843 2843
2844usage: (make-serial-process &rest ARGS) */) 2844usage: (make-serial-process &rest ARGS) */)
2845 (ptrdiff_t nargs, Lisp_Object *args) 2845 (ptrdiff_t nargs, Lisp_Object *args)