diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/pc-win.el | 25 |
2 files changed, 28 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d8e66425d75..50dcc78c947 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-04-16 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * term/pc-win.el (x-list-fonts, x-get-selection-value): Provide | ||
| 4 | doc strings, as required by snarf-documentation. | ||
| 5 | |||
| 1 | 2014-04-15 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-04-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * ps-def.el (ps-generate-postscript-with-faces1): Use the new `sorted' | 8 | * ps-def.el (ps-generate-postscript-with-faces1): Use the new `sorted' |
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 00b860f8dcc..f24a54fbe28 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el | |||
| @@ -165,6 +165,27 @@ created." | |||
| 165 | 165 | ||
| 166 | ;; From src/xfns.c | 166 | ;; From src/xfns.c |
| 167 | (defun x-list-fonts (_pattern &optional _face _frame _maximum width) | 167 | (defun x-list-fonts (_pattern &optional _face _frame _maximum width) |
| 168 | "Return a list of the names of available fonts matching PATTERN. | ||
| 169 | If optional arguments FACE and FRAME are specified, return only fonts | ||
| 170 | the same size as FACE on FRAME. | ||
| 171 | |||
| 172 | PATTERN should be a string containing a font name in the XLFD, | ||
| 173 | Fontconfig, or GTK format. A font name given in the XLFD format may | ||
| 174 | contain wildcard characters: | ||
| 175 | the * character matches any substring, and | ||
| 176 | the ? character matches any single character. | ||
| 177 | PATTERN is case-insensitive. | ||
| 178 | |||
| 179 | The return value is a list of strings, suitable as arguments to | ||
| 180 | \`set-face-font'. | ||
| 181 | |||
| 182 | Fonts Emacs can't use may or may not be excluded | ||
| 183 | even if they match PATTERN and FACE. | ||
| 184 | The optional fourth argument MAXIMUM sets a limit on how many | ||
| 185 | fonts to match. The first MAXIMUM fonts are reported. | ||
| 186 | The optional fifth argument WIDTH, if specified, is a number of columns | ||
| 187 | occupied by a character of a font. In that case, return only fonts | ||
| 188 | the WIDTH times as wide as FACE on FRAME." | ||
| 168 | (if (or (null width) (and (numberp width) (= width 1))) | 189 | (if (or (null width) (and (numberp width) (= width 1))) |
| 169 | (list "ms-dos") | 190 | (list "ms-dos") |
| 170 | (list "no-such-font"))) | 191 | (list "no-such-font"))) |
| @@ -232,9 +253,9 @@ is not used)." | |||
| 232 | (w16-set-clipboard-data text)) | 253 | (w16-set-clipboard-data text)) |
| 233 | (setq x-last-selected-text text)) | 254 | (setq x-last-selected-text text)) |
| 234 | 255 | ||
| 235 | ;;; Return the value of the current selection. | ||
| 236 | ;;; Consult the selection. Treat empty strings as if they were unset. | ||
| 237 | (defun x-get-selection-value () | 256 | (defun x-get-selection-value () |
| 257 | "Return the value of the current selection. | ||
| 258 | Consult the selection. Treat empty strings as if they were unset." | ||
| 238 | (if x-select-enable-clipboard | 259 | (if x-select-enable-clipboard |
| 239 | (let (text) | 260 | (let (text) |
| 240 | ;; Don't die if x-get-selection signals an error. | 261 | ;; Don't die if x-get-selection signals an error. |