diff options
| author | Stefan Kangas | 2024-07-25 03:35:04 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2024-07-25 03:35:18 +0200 |
| commit | a79966156633ae1e49e3fef17ff7212c8f35a26f (patch) | |
| tree | 3395389467c1effba572a2db7efb9d39def72425 /src | |
| parent | 67faaead754c0a11bd89fdcde2533bc51b71ef0e (diff) | |
| download | emacs-a79966156633ae1e49e3fef17ff7212c8f35a26f.tar.gz emacs-a79966156633ae1e49e3fef17ff7212c8f35a26f.zip | |
Standardize possessive apostrophe usage in manuals, docs, and comments
See the note in admin/notes/documentation.
Ref: https://lists.gnu.org/r/emacs-devel/2012-02/msg00649.html
Diffstat (limited to 'src')
| -rw-r--r-- | src/androidfns.c | 2 | ||||
| -rw-r--r-- | src/callproc.c | 2 | ||||
| -rw-r--r-- | src/charset.c | 2 | ||||
| -rw-r--r-- | src/charset.h | 2 | ||||
| -rw-r--r-- | src/coding.c | 22 | ||||
| -rw-r--r-- | src/filelock.c | 2 | ||||
| -rw-r--r-- | src/haikufns.c | 2 | ||||
| -rw-r--r-- | src/image.c | 2 | ||||
| -rw-r--r-- | src/itree.c | 2 | ||||
| -rw-r--r-- | src/msdos.c | 2 | ||||
| -rw-r--r-- | src/nsfns.m | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 2 | ||||
| -rw-r--r-- | src/sqlite.c | 2 | ||||
| -rw-r--r-- | src/w32fns.c | 4 | ||||
| -rw-r--r-- | src/xfns.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
16 files changed, 27 insertions, 27 deletions
diff --git a/src/androidfns.c b/src/androidfns.c index af2247ad962..434a2f0d410 100644 --- a/src/androidfns.c +++ b/src/androidfns.c | |||
| @@ -1740,7 +1740,7 @@ android_frame_list_z_order (struct android_display_info *dpyinfo, | |||
| 1740 | 1740 | ||
| 1741 | DEFUN ("android-frame-list-z-order", Fandroid_frame_list_z_order, | 1741 | DEFUN ("android-frame-list-z-order", Fandroid_frame_list_z_order, |
| 1742 | Sandroid_frame_list_z_order, 0, 1, 0, | 1742 | Sandroid_frame_list_z_order, 0, 1, 0, |
| 1743 | doc: /* Return list of Emacs' frames, in Z (stacking) order. | 1743 | doc: /* Return list of Emacs's frames, in Z (stacking) order. |
| 1744 | The optional argument TERMINAL specifies which display to ask about. | 1744 | The optional argument TERMINAL specifies which display to ask about. |
| 1745 | TERMINAL should be either a frame or a display name (a string). If | 1745 | TERMINAL should be either a frame or a display name (a string). If |
| 1746 | omitted or nil, that stands for the selected frame's display. Return | 1746 | omitted or nil, that stands for the selected frame's display. Return |
diff --git a/src/callproc.c b/src/callproc.c index e116298baef..3f2c60a2151 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1721,7 +1721,7 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value, | |||
| 1721 | Vprocess_environment)) | 1721 | Vprocess_environment)) |
| 1722 | return *value ? 1 : 0; | 1722 | return *value ? 1 : 0; |
| 1723 | 1723 | ||
| 1724 | /* On Windows we make some modifications to Emacs' environment | 1724 | /* On Windows we make some modifications to Emacs's environment |
| 1725 | without recording them in Vprocess_environment. */ | 1725 | without recording them in Vprocess_environment. */ |
| 1726 | #ifdef WINDOWSNT | 1726 | #ifdef WINDOWSNT |
| 1727 | { | 1727 | { |
diff --git a/src/charset.c b/src/charset.c index 675097c6843..e8d0826f4c2 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -101,7 +101,7 @@ Lisp_Object Vemacs_mule_charset_list; | |||
| 101 | int emacs_mule_charset[256]; | 101 | int emacs_mule_charset[256]; |
| 102 | 102 | ||
| 103 | /* Mapping table from ISO2022's charset (specified by DIMENSION, | 103 | /* Mapping table from ISO2022's charset (specified by DIMENSION, |
| 104 | CHARS, and FINAL-CHAR) to Emacs' charset. */ | 104 | CHARS, and FINAL-CHAR) to Emacs's charset. */ |
| 105 | int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; | 105 | int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; |
| 106 | 106 | ||
| 107 | #define CODE_POINT_TO_INDEX(charset, code) \ | 107 | #define CODE_POINT_TO_INDEX(charset, code) \ |
diff --git a/src/charset.h b/src/charset.h index 1edb4a248ac..f08d536f635 100644 --- a/src/charset.h +++ b/src/charset.h | |||
| @@ -467,7 +467,7 @@ extern bool charset_map_loaded; | |||
| 467 | #define ISO_MAX_FINAL 0x80 /* only 0x30..0xFF are used */ | 467 | #define ISO_MAX_FINAL 0x80 /* only 0x30..0xFF are used */ |
| 468 | 468 | ||
| 469 | /* Mapping table from ISO2022's charset (specified by DIMENSION, | 469 | /* Mapping table from ISO2022's charset (specified by DIMENSION, |
| 470 | CHARS, and FINAL_CHAR) to Emacs' charset ID. Should be accessed by | 470 | CHARS, and FINAL_CHAR) to Emacs's charset ID. Should be accessed by |
| 471 | macro ISO_CHARSET_TABLE (DIMENSION, CHARS, FINAL_CHAR). */ | 471 | macro ISO_CHARSET_TABLE (DIMENSION, CHARS, FINAL_CHAR). */ |
| 472 | extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; | 472 | extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; |
| 473 | 473 | ||
diff --git a/src/coding.c b/src/coding.c index b48164efc69..b21ed360578 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -27,11 +27,11 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 27 | 27 | ||
| 28 | 0. General comments | 28 | 0. General comments |
| 29 | 1. Preamble | 29 | 1. Preamble |
| 30 | 2. Emacs' internal format (emacs-utf-8) handlers | 30 | 2. Emacs's internal format (emacs-utf-8) handlers |
| 31 | 3. UTF-8 handlers | 31 | 3. UTF-8 handlers |
| 32 | 4. UTF-16 handlers | 32 | 4. UTF-16 handlers |
| 33 | 5. Charset-base coding systems handlers | 33 | 5. Charset-base coding systems handlers |
| 34 | 6. emacs-mule (old Emacs' internal format) handlers | 34 | 6. emacs-mule (old Emacs's internal format) handlers |
| 35 | 7. ISO2022 handlers | 35 | 7. ISO2022 handlers |
| 36 | 8. Shift-JIS and BIG5 handlers | 36 | 8. Shift-JIS and BIG5 handlers |
| 37 | 9. CCL handlers | 37 | 9. CCL handlers |
| @@ -50,7 +50,7 @@ CODING SYSTEM | |||
| 50 | information about how to convert byte sequences to character | 50 | information about how to convert byte sequences to character |
| 51 | sequences and vice versa. When we say "decode", it means converting | 51 | sequences and vice versa. When we say "decode", it means converting |
| 52 | a byte sequence of a specific coding system into a character | 52 | a byte sequence of a specific coding system into a character |
| 53 | sequence that is represented by Emacs' internal coding system | 53 | sequence that is represented by Emacs's internal coding system |
| 54 | `emacs-utf-8', and when we say "encode", it means converting a | 54 | `emacs-utf-8', and when we say "encode", it means converting a |
| 55 | character sequence of emacs-utf-8 to a byte sequence of a specific | 55 | character sequence of emacs-utf-8 to a byte sequence of a specific |
| 56 | coding system. | 56 | coding system. |
| @@ -1104,7 +1104,7 @@ alloc_destination (struct coding_system *coding, ptrdiff_t nbytes, | |||
| 1104 | #define EOL_SEEN_CRLF 4 | 1104 | #define EOL_SEEN_CRLF 4 |
| 1105 | 1105 | ||
| 1106 | 1106 | ||
| 1107 | /*** 2. Emacs' internal format (emacs-utf-8) ***/ | 1107 | /*** 2. Emacs's internal format (emacs-utf-8) ***/ |
| 1108 | 1108 | ||
| 1109 | 1109 | ||
| 1110 | 1110 | ||
| @@ -1757,9 +1757,9 @@ encode_coding_utf_16 (struct coding_system *coding) | |||
| 1757 | } | 1757 | } |
| 1758 | 1758 | ||
| 1759 | 1759 | ||
| 1760 | /*** 6. Old Emacs' internal format (emacs-mule) ***/ | 1760 | /*** 6. Old Emacs's internal format (emacs-mule) ***/ |
| 1761 | 1761 | ||
| 1762 | /* Emacs' internal format for representation of multiple character | 1762 | /* Emacs's internal format for representation of multiple character |
| 1763 | sets is a kind of multi-byte encoding, i.e. characters are | 1763 | sets is a kind of multi-byte encoding, i.e. characters are |
| 1764 | represented by variable-length sequences of one-byte codes. | 1764 | represented by variable-length sequences of one-byte codes. |
| 1765 | 1765 | ||
| @@ -1782,7 +1782,7 @@ encode_coding_utf_16 (struct coding_system *coding) | |||
| 1782 | through 0xFF. See `charset.h' for more details about leading-code | 1782 | through 0xFF. See `charset.h' for more details about leading-code |
| 1783 | and position-code. | 1783 | and position-code. |
| 1784 | 1784 | ||
| 1785 | --- CODE RANGE of Emacs' internal format --- | 1785 | --- CODE RANGE of Emacs's internal format --- |
| 1786 | character set range | 1786 | character set range |
| 1787 | ------------- ----- | 1787 | ------------- ----- |
| 1788 | ascii 0x00..0x7F | 1788 | ascii 0x00..0x7F |
| @@ -2812,7 +2812,7 @@ encode_coding_emacs_mule (struct coding_system *coding) | |||
| 2812 | localized platforms), and all of these are variants of ISO2022. | 2812 | localized platforms), and all of these are variants of ISO2022. |
| 2813 | 2813 | ||
| 2814 | In addition to the above, Emacs handles two more kinds of escape | 2814 | In addition to the above, Emacs handles two more kinds of escape |
| 2815 | sequences: ISO6429's direction specification and Emacs' private | 2815 | sequences: ISO6429's direction specification and Emacs's private |
| 2816 | sequence for specifying character composition. | 2816 | sequence for specifying character composition. |
| 2817 | 2817 | ||
| 2818 | ISO6429's direction specification takes the following form: | 2818 | ISO6429's direction specification takes the following form: |
| @@ -6045,7 +6045,7 @@ complement_process_encoding_system (Lisp_Object coding_system) | |||
| 6045 | 6045 | ||
| 6046 | 6046 | ||
| 6047 | /* Emacs has a mechanism to automatically detect a coding system if it | 6047 | /* Emacs has a mechanism to automatically detect a coding system if it |
| 6048 | is one of Emacs' internal format, ISO2022, SJIS, and BIG5. But, | 6048 | is one of Emacs's internal format, ISO2022, SJIS, and BIG5. But, |
| 6049 | it's impossible to distinguish some coding systems accurately | 6049 | it's impossible to distinguish some coding systems accurately |
| 6050 | because they use the same range of codes. So, at first, coding | 6050 | because they use the same range of codes. So, at first, coding |
| 6051 | systems are categorized into 7, those are: | 6051 | systems are categorized into 7, those are: |
| @@ -6053,7 +6053,7 @@ complement_process_encoding_system (Lisp_Object coding_system) | |||
| 6053 | o coding-category-emacs-mule | 6053 | o coding-category-emacs-mule |
| 6054 | 6054 | ||
| 6055 | The category for a coding system which has the same code range | 6055 | The category for a coding system which has the same code range |
| 6056 | as Emacs' internal format. Assigned the coding-system (Lisp | 6056 | as Emacs's internal format. Assigned the coding-system (Lisp |
| 6057 | symbol) `emacs-mule' by default. | 6057 | symbol) `emacs-mule' by default. |
| 6058 | 6058 | ||
| 6059 | o coding-category-sjis | 6059 | o coding-category-sjis |
| @@ -10052,7 +10052,7 @@ encode_string_utf_8 (Lisp_Object string, Lisp_Object buffer, | |||
| 10052 | Emacs decoding does. | 10052 | Emacs decoding does. |
| 10053 | 10053 | ||
| 10054 | If HANDLE-OVER-UNI is Qt, decode a 4 or 5-byte overlong sequence | 10054 | If HANDLE-OVER-UNI is Qt, decode a 4 or 5-byte overlong sequence |
| 10055 | that follows Emacs' internal representation for a character beyond | 10055 | that follows Emacs's internal representation for a character beyond |
| 10056 | Unicode range into the corresponding character, like the usual | 10056 | Unicode range into the corresponding character, like the usual |
| 10057 | Emacs decoding does. | 10057 | Emacs decoding does. |
| 10058 | 10058 | ||
diff --git a/src/filelock.c b/src/filelock.c index 43ede30975e..69bd0322d4c 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -73,7 +73,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 73 | theoretically be updated by daemons running separately -- but this | 73 | theoretically be updated by daemons running separately -- but this |
| 74 | whole idea is unimplemented; in practice, at least in our | 74 | whole idea is unimplemented; in practice, at least in our |
| 75 | environment, it seems such stale locks arise fairly infrequently, and | 75 | environment, it seems such stale locks arise fairly infrequently, and |
| 76 | Emacs' standard methods of dealing with clashes suffice. | 76 | Emacs's standard methods of dealing with clashes suffice. |
| 77 | 77 | ||
| 78 | We use symlinks instead of normal files because (1) they can be | 78 | We use symlinks instead of normal files because (1) they can be |
| 79 | stored more efficiently on the filesystem, since the kernel knows | 79 | stored more efficiently on the filesystem, since the kernel knows |
diff --git a/src/haikufns.c b/src/haikufns.c index 4a31def4def..b4b88b434e4 100644 --- a/src/haikufns.c +++ b/src/haikufns.c | |||
| @@ -2943,7 +2943,7 @@ It can later be retrieved with `x-get-resource'. */) | |||
| 2943 | 2943 | ||
| 2944 | DEFUN ("haiku-frame-list-z-order", Fhaiku_frame_list_z_order, | 2944 | DEFUN ("haiku-frame-list-z-order", Fhaiku_frame_list_z_order, |
| 2945 | Shaiku_frame_list_z_order, 0, 1, 0, | 2945 | Shaiku_frame_list_z_order, 0, 1, 0, |
| 2946 | doc: /* Return list of Emacs' frames, in Z (stacking) order. | 2946 | doc: /* Return list of Emacs's frames, in Z (stacking) order. |
| 2947 | If TERMINAL is non-nil and specifies a live frame, return the child | 2947 | If TERMINAL is non-nil and specifies a live frame, return the child |
| 2948 | frames of that frame in Z (stacking) order. | 2948 | frames of that frame in Z (stacking) order. |
| 2949 | 2949 | ||
diff --git a/src/image.c b/src/image.c index db1b05cbcd7..0b590faab76 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -5436,7 +5436,7 @@ static const struct image_keyword xpm_format[XPM_LAST] = | |||
| 5436 | 5436 | ||
| 5437 | #if defined HAVE_X_WINDOWS && !defined USE_CAIRO | 5437 | #if defined HAVE_X_WINDOWS && !defined USE_CAIRO |
| 5438 | 5438 | ||
| 5439 | /* Define ALLOC_XPM_COLORS if we can use Emacs' own color allocation | 5439 | /* Define ALLOC_XPM_COLORS if we can use Emacs's own color allocation |
| 5440 | functions for allocating image colors. Our own functions handle | 5440 | functions for allocating image colors. Our own functions handle |
| 5441 | color allocation failures more gracefully than the ones on the XPM | 5441 | color allocation failures more gracefully than the ones on the XPM |
| 5442 | lib. */ | 5442 | lib. */ |
diff --git a/src/itree.c b/src/itree.c index 9dae279db90..749e65c2eed 100644 --- a/src/itree.c +++ b/src/itree.c | |||
| @@ -64,7 +64,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 64 | 64 | ||
| 65 | ==== FIXME: bug#58342 some important operations remain slow === | 65 | ==== FIXME: bug#58342 some important operations remain slow === |
| 66 | 66 | ||
| 67 | The amortized costs of Emacs' previous-overlay-change and | 67 | The amortized costs of Emacs's previous-overlay-change and |
| 68 | next-overlay-change functions are O(N) with this data structure. | 68 | next-overlay-change functions are O(N) with this data structure. |
| 69 | The root problem is that we only have an order for the BEG field, | 69 | The root problem is that we only have an order for the BEG field, |
| 70 | but not the END. The previous/next overlay change operations need | 70 | but not the END. The previous/next overlay change operations need |
diff --git a/src/msdos.c b/src/msdos.c index e9faa48fa70..42eee89d748 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -599,7 +599,7 @@ dos_set_window_size (int *rows, int *cols) | |||
| 599 | *rows = ScreenRows (); | 599 | *rows = ScreenRows (); |
| 600 | *cols = ScreenCols (); | 600 | *cols = ScreenCols (); |
| 601 | 601 | ||
| 602 | /* Update Emacs' notion of screen dimensions. */ | 602 | /* Update Emacs's notion of screen dimensions. */ |
| 603 | screen_size_X = *cols; | 603 | screen_size_X = *cols; |
| 604 | screen_size_Y = *rows; | 604 | screen_size_Y = *rows; |
| 605 | screen_size = *cols * *rows; | 605 | screen_size = *cols * *rows; |
diff --git a/src/nsfns.m b/src/nsfns.m index add7a93dfba..3c012ca8f05 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -1628,7 +1628,7 @@ ns_window_is_ancestor (NSWindow *win, NSWindow *candidate) | |||
| 1628 | 1628 | ||
| 1629 | DEFUN ("ns-frame-list-z-order", Fns_frame_list_z_order, | 1629 | DEFUN ("ns-frame-list-z-order", Fns_frame_list_z_order, |
| 1630 | Sns_frame_list_z_order, 0, 1, 0, | 1630 | Sns_frame_list_z_order, 0, 1, 0, |
| 1631 | doc: /* Return list of Emacs' frames, in Z (stacking) order. | 1631 | doc: /* Return list of Emacs's frames, in Z (stacking) order. |
| 1632 | If TERMINAL is non-nil and specifies a live frame, return the child | 1632 | If TERMINAL is non-nil and specifies a live frame, return the child |
| 1633 | frames of that frame in Z (stacking) order. | 1633 | frames of that frame in Z (stacking) order. |
| 1634 | 1634 | ||
diff --git a/src/nsterm.m b/src/nsterm.m index 2aadada2df6..575b24754e7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -577,7 +577,7 @@ ns_init_locale (void) | |||
| 577 | } | 577 | } |
| 578 | 578 | ||
| 579 | /* Check if LANG can be used for initializing the locale. If not, | 579 | /* Check if LANG can be used for initializing the locale. If not, |
| 580 | use a default setting. Note that Emacs' main will undo the | 580 | use a default setting. Note that Emacs's main will undo the |
| 581 | setlocale below, initializing the locale from the | 581 | setlocale below, initializing the locale from the |
| 582 | environment. */ | 582 | environment. */ |
| 583 | if (setlocale (LC_ALL, lang) == NULL) | 583 | if (setlocale (LC_ALL, lang) == NULL) |
diff --git a/src/sqlite.c b/src/sqlite.c index 32482b30f35..88b02339863 100644 --- a/src/sqlite.c +++ b/src/sqlite.c | |||
| @@ -700,7 +700,7 @@ MODULE should be the name of an SQlite module's file, a | |||
| 700 | shared library in the system-dependent format and having a | 700 | shared library in the system-dependent format and having a |
| 701 | system-dependent file-name extension. | 701 | system-dependent file-name extension. |
| 702 | 702 | ||
| 703 | Only modules on Emacs' list of allowed modules can be loaded. */) | 703 | Only modules on Emacs's list of allowed modules can be loaded. */) |
| 704 | (Lisp_Object db, Lisp_Object module) | 704 | (Lisp_Object db, Lisp_Object module) |
| 705 | { | 705 | { |
| 706 | check_sqlite (db, false); | 706 | check_sqlite (db, false); |
diff --git a/src/w32fns.c b/src/w32fns.c index f23d3c63b25..d20e7d53ea1 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -3901,7 +3901,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam, | |||
| 3901 | most probably, not needed -- and harms a lot). | 3901 | most probably, not needed -- and harms a lot). |
| 3902 | 3902 | ||
| 3903 | So, with the usual message pump, the following call to TranslateMessage() | 3903 | So, with the usual message pump, the following call to TranslateMessage() |
| 3904 | is not needed (and is going to be VERY harmful). With Emacs' message | 3904 | is not needed (and is going to be VERY harmful). With Emacs's message |
| 3905 | pump, the call is needed. */ | 3905 | pump, the call is needed. */ |
| 3906 | if (do_translate) | 3906 | if (do_translate) |
| 3907 | { | 3907 | { |
| @@ -9321,7 +9321,7 @@ w32_frame_list_z_order (struct w32_display_info *dpyinfo, HWND window) | |||
| 9321 | 9321 | ||
| 9322 | DEFUN ("w32-frame-list-z-order", Fw32_frame_list_z_order, | 9322 | DEFUN ("w32-frame-list-z-order", Fw32_frame_list_z_order, |
| 9323 | Sw32_frame_list_z_order, 0, 1, 0, | 9323 | Sw32_frame_list_z_order, 0, 1, 0, |
| 9324 | doc: /* Return list of Emacs' frames, in Z (stacking) order. | 9324 | doc: /* Return list of Emacs's frames, in Z (stacking) order. |
| 9325 | The optional argument DISPLAY specifies which display to ask about. | 9325 | The optional argument DISPLAY specifies which display to ask about. |
| 9326 | DISPLAY should be either a frame or a display name (a string). If | 9326 | DISPLAY should be either a frame or a display name (a string). If |
| 9327 | omitted or nil, that stands for the selected frame's display. | 9327 | omitted or nil, that stands for the selected frame's display. |
diff --git a/src/xfns.c b/src/xfns.c index 9bc2f794849..829bcb00f35 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -7060,7 +7060,7 @@ x_frame_list_z_order (struct x_display_info *dpyinfo, Window window) | |||
| 7060 | 7060 | ||
| 7061 | DEFUN ("x-frame-list-z-order", Fx_frame_list_z_order, | 7061 | DEFUN ("x-frame-list-z-order", Fx_frame_list_z_order, |
| 7062 | Sx_frame_list_z_order, 0, 1, 0, | 7062 | Sx_frame_list_z_order, 0, 1, 0, |
| 7063 | doc: /* Return list of Emacs' frames, in Z (stacking) order. | 7063 | doc: /* Return list of Emacs's frames, in Z (stacking) order. |
| 7064 | The optional argument TERMINAL specifies which display to ask about. | 7064 | The optional argument TERMINAL specifies which display to ask about. |
| 7065 | TERMINAL should be either a frame or a display name (a string). If | 7065 | TERMINAL should be either a frame or a display name (a string). If |
| 7066 | omitted or nil, that stands for the selected frame's display. Return | 7066 | omitted or nil, that stands for the selected frame's display. Return |
diff --git a/src/xterm.c b/src/xterm.c index 5e200203f64..215a3ed3bbe 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -32245,7 +32245,7 @@ x_initialize (void) | |||
| 32245 | Xt_app_con = XtCreateApplicationContext (); | 32245 | Xt_app_con = XtCreateApplicationContext (); |
| 32246 | 32246 | ||
| 32247 | /* Register a converter from strings to pixels, which uses | 32247 | /* Register a converter from strings to pixels, which uses |
| 32248 | Emacs' color allocation infrastructure. */ | 32248 | Emacs's color allocation infrastructure. */ |
| 32249 | XtAppSetTypeConverter (Xt_app_con, | 32249 | XtAppSetTypeConverter (Xt_app_con, |
| 32250 | XtRString, XtRPixel, cvt_string_to_pixel, | 32250 | XtRString, XtRPixel, cvt_string_to_pixel, |
| 32251 | cvt_string_to_pixel_args, | 32251 | cvt_string_to_pixel_args, |