aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2008-01-19 05:27:20 +0000
committerStefan Monnier2008-01-19 05:27:20 +0000
commite69c4cae1801f1578819d72dd6c798c4e0b09dde (patch)
tree2f646cd5d069c49820427b2971071fdd57349686 /src
parent823e0ebb51743ee935104b98badfa4a015ff231a (diff)
downloademacs-e69c4cae1801f1578819d72dd6c798c4e0b09dde.tar.gz
emacs-e69c4cae1801f1578819d72dd6c798c4e0b09dde.zip
(list_processes_1): Don't use SCHARS on a nil buffer name.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/process.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3e11968fb58..0667c484acb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12008-01-19 Stefan Monnier <monnier@iro.umontreal.ca> 12008-01-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * process.c (list_processes_1): Don't use SCHARS on a nil buffer name.
4
3 * xdisp.c (Qauto_hscroll_mode): New var. 5 * xdisp.c (Qauto_hscroll_mode): New var.
4 (syms_of_xdisp): Initialize it. 6 (syms_of_xdisp): Initialize it.
5 (hscroll_window_tree): Use it to lookup `auto-hscroll-mode' in each 7 (hscroll_window_tree): Use it to lookup `auto-hscroll-mode' in each
diff --git a/src/process.c b/src/process.c
index 8e932be7b0c..c7ca36a847f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1359,8 +1359,11 @@ list_processes_1 (query_only)
1359 w_proc = i; 1359 w_proc = i;
1360 if (!NILP (p->buffer)) 1360 if (!NILP (p->buffer))
1361 { 1361 {
1362 if (NILP (XBUFFER (p->buffer)->name) && w_buffer < 8) 1362 if (NILP (XBUFFER (p->buffer)->name))
1363 w_buffer = 8; /* (Killed) */ 1363 {
1364 if (w_buffer < 8)
1365 w_buffer = 8; /* (Killed) */
1366 }
1364 else if ((i = SCHARS (XBUFFER (p->buffer)->name), (i > w_buffer))) 1367 else if ((i = SCHARS (XBUFFER (p->buffer)->name), (i > w_buffer)))
1365 w_buffer = i; 1368 w_buffer = i;
1366 } 1369 }