Skip to content

Commit

Permalink
Merge pull request #49 from sharplispers/unify-packages
Browse files Browse the repository at this point in the history
Unify packages
  • Loading branch information
dkochmanski authored Aug 22, 2016
2 parents 0ab37cc + 53fd7a0 commit 784071e
Show file tree
Hide file tree
Showing 12 changed files with 209 additions and 209 deletions.
2 changes: 1 addition & 1 deletion clx.asd
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

(defclass legacy-file (static-file) ())

(defsystem CLX
(defsystem #:clx
:description "An implementation of the X Window System protocol in Lisp."
:author "Texas Instruments Incorporated.
Franz Inc, Berkeley, Ca.
Expand Down
4 changes: 2 additions & 2 deletions demo/clclock.lisp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(defpackage "XCLCLOCK"
(defpackage #:xlib-demo/clclock
(:use "CL")
(:export "CLOCK"))

(in-package "XCLCLOCK")
(in-package #:xlib-demo/clclock)

(defvar *display* (xlib:open-default-display))
(defvar *screen* (xlib:display-default-screen *display*))
Expand Down
4 changes: 2 additions & 2 deletions demo/clipboard.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
;;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
;;; DEALINGS IN THE SOFTWARE.

(defpackage "CLIPBOARD"
(defpackage #:xlib-demo/clipboard
(:use "CL" "XLIB")
(:export "MAIN"))

(in-package "CLIPBOARD")
(in-package #:xlib-demo/clipboard)

;;; This is "traditional" XLIB style; I don't really know if it's the
;;; best way -- in developing this program, style of XLIB programming
Expand Down
4 changes: 2 additions & 2 deletions demo/clx-demos.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
;;; This file should be portable to any valid Common Lisp with CLX -- DEC 88.
;;;

(defpackage :demos (:use :common-lisp)
(defpackage #:xlib-demo/demos (:use :common-lisp)
(:export do-all-demos demo))

(in-package :demos)
(in-package :xlib-demo/demos)


;;;; Graphic demos wrapper macro.
Expand Down
Loading

0 comments on commit 784071e

Please sign in to comment.