diff options
Diffstat (limited to 'lisp/net/newst-treeview.el')
| -rw-r--r-- | lisp/net/newst-treeview.el | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 1bed61f3e7d..ff8a447c7c1 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el | |||
| @@ -131,14 +131,6 @@ groupcontent := feedname | groupdefinition) | |||
| 131 | Example: (\"Topmost group\" \"feed1\" (\"subgroup1\" \"feed 2\") | 131 | Example: (\"Topmost group\" \"feed1\" (\"subgroup1\" \"feed 2\") |
| 132 | \"feed3\")") | 132 | \"feed3\")") |
| 133 | 133 | ||
| 134 | (defcustom newsticker-groups-filename | ||
| 135 | nil | ||
| 136 | "Name of the newsticker groups settings file." | ||
| 137 | :version "25.1" ; changed default value to nil | ||
| 138 | :type '(choice (const nil) string) | ||
| 139 | :group 'newsticker-treeview) | ||
| 140 | (make-obsolete-variable 'newsticker-groups-filename 'newsticker-dir "23.1") | ||
| 141 | |||
| 142 | ;; ====================================================================== | 134 | ;; ====================================================================== |
| 143 | ;;; internal variables | 135 | ;;; internal variables |
| 144 | ;; ====================================================================== | 136 | ;; ====================================================================== |
| @@ -1265,29 +1257,9 @@ Note: does not update the layout." | |||
| 1265 | (defun newsticker--treeview-load () | 1257 | (defun newsticker--treeview-load () |
| 1266 | "Load treeview settings." | 1258 | "Load treeview settings." |
| 1267 | (let* ((coding-system-for-read 'utf-8) | 1259 | (let* ((coding-system-for-read 'utf-8) |
| 1268 | (filename | 1260 | (filename (concat newsticker-dir "/groups")) |
| 1269 | (or (and newsticker-groups-filename | ||
| 1270 | (not (string= | ||
| 1271 | (expand-file-name newsticker-groups-filename) | ||
| 1272 | (expand-file-name (concat newsticker-dir "/groups")))) | ||
| 1273 | (file-exists-p newsticker-groups-filename) | ||
| 1274 | (y-or-n-p | ||
| 1275 | (format-message | ||
| 1276 | (concat "Obsolete variable `newsticker-groups-filename' " | ||
| 1277 | "points to existing file \"%s\".\n" | ||
| 1278 | "Read it? ") | ||
| 1279 | newsticker-groups-filename)) | ||
| 1280 | newsticker-groups-filename) | ||
| 1281 | (concat newsticker-dir "/groups"))) | ||
| 1282 | (buf (and (file-exists-p filename) | 1261 | (buf (and (file-exists-p filename) |
| 1283 | (find-file-noselect filename)))) | 1262 | (find-file-noselect filename)))) |
| 1284 | (and newsticker-groups-filename | ||
| 1285 | (file-exists-p newsticker-groups-filename) | ||
| 1286 | (y-or-n-p (format-message | ||
| 1287 | (concat "Delete the file \"%s\",\nto which the obsolete " | ||
| 1288 | "variable `newsticker-groups-filename' points ? ") | ||
| 1289 | newsticker-groups-filename)) | ||
| 1290 | (delete-file newsticker-groups-filename)) | ||
| 1291 | (when buf | 1263 | (when buf |
| 1292 | (set-buffer buf) | 1264 | (set-buffer buf) |
| 1293 | (goto-char (point-min)) | 1265 | (goto-char (point-min)) |